diff options
| author | igor@rurik.mysql.com <> | 2005-01-15 01:05:00 -0800 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2005-01-15 01:05:00 -0800 |
| commit | cd577f2590ea972f7692cccd4d98197c9c8c51a3 (patch) | |
| tree | 3adb20484b260235a7782a6a75a8fc120a8e69e3 /sql/item_sum.h | |
| parent | 5ebcb21f12c21c2634616ce9b87eb96666038523 (diff) | |
| download | mariadb-git-cd577f2590ea972f7692cccd4d98197c9c8c51a3.tar.gz | |
func_gconcat.result, func_gconcat.test:
Added a test case for bug #7769.
item_sum.h:
Fixed bug #7769: a crash for queries with group_concat and
having when the query table was empty.
The bug was due an unsafe dereferencing.
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index cec611b8854..d1e82387944 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -739,9 +739,10 @@ class Item_func_group_concat : public Item_sum String *res; char *end_ptr; int error; - res= val_str(&str_value); + if (!(res= val_str(&str_value))) + return (longlong) 0; end_ptr= (char*) res->ptr()+ res->length(); - return res ? my_strtoll10(res->ptr(), &end_ptr, &error) : (longlong) 0; + return my_strtoll10(res->ptr(), &end_ptr, &error); } String* val_str(String* str); Item *copy_or_same(THD* thd); |