correct the NULL-pointer test

fa51f70d · Sergei Golubchik · 877de3af · fa51f70d
Commit fa51f70d authored Aug 04, 2015 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/item_sum.cc sql/item_sum.cc +3 -2

No files found.
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -3518,9 +3518,10 @@ bool Item_func_group_concat::setup(THD *thd)
  {
    uint n_elems= arg_count_order + all_fields.elements;
    ref_pointer_array= static_cast<Item**>(thd->alloc(sizeof(Item*) * n_elems));
+    if (!ref_pointer_array)
+      DBUG_RETURN(TRUE);
    memcpy(ref_pointer_array, args, arg_count * sizeof(Item*));
-    if (!ref_pointer_array ||
+    if (setup_order(thd, ref_pointer_array, context->table_list, list,
-        setup_order(thd, ref_pointer_array, context->table_list, list,
                    all_fields, *order))
      DBUG_RETURN(TRUE);
  }