correct the NULL-pointer test

MariaDB · Aug 4, 2015 · fa51f70 · fa51f70
1 parent 877de3a
commit fa51f70
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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 ||
-        setup_order(thd, ref_pointer_array, context->table_list, list,
+    if (setup_order(thd, ref_pointer_array, context->table_list, list,
                     all_fields, *order))
       DBUG_RETURN(TRUE);
   }