1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug#23195404 EXCESSIVE MEMORY CAN BE USED BY THE QUOTE()

Browse Source 
STRING FUNCTION

Fix:
=======
Added code in QUOTE string function to honor max_allowed_packet.
This commit is contained in:
Ajo Robert 2017-02-23 18:27:09 +05:30
parent 7ec26b03a7
commit b21a0212e4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sql/item_strfunc.cc
View File

@ -1,5 +1,5 @@
/* /*
Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -3649,6 +3649,17 @@ String *Item_func_quote::val_str(String *str)
*to= '\''; *to= '\'';
ret: ret:
if (new_length > current_thd->variables.max_allowed_packet)
{
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_WARN_ALLOWED_PACKET_OVERFLOWED,
ER_THD(current_thd, ER_WARN_ALLOWED_PACKET_OVERFLOWED),
func_name(),
current_thd->variables.max_allowed_packet);
null_value= true;
return NULL;
}
tmp_value.length(new_length); tmp_value.length(new_length);
tmp_value.set_charset(collation.collation); tmp_value.set_charset(collation.collation);
null_value= 0; null_value= 0;