Merge pull request #143 from kenhys/check-invalid-argument

add missing null check Patch by Kentaro Hayashi. Thanks!!!
mroonga · Jun 7, 2017 · a24ae13 · a24ae13
2 parents 3fa72e1 + fd9bda6
commit a24ae13
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -8705,6 +8705,14 @@ FT_INFO *ha_mroonga::generic_ft_init_ext(uint flags, uint key_nr, String *key)
     matched_record_keys = grn_table_create(ctx, NULL, 0, NULL,
                                            GRN_OBJ_TABLE_HASH_KEY | GRN_OBJ_WITH_SUBREC,
                                            grn_table, 0);
+    if (!matched_record_keys) {
+      char error_message[MRN_MESSAGE_BUFFER_SIZE];
+      snprintf(error_message, MRN_MESSAGE_BUFFER_SIZE,
+               "failed to create a table for matched record: <%s>",
+               ctx->errbuf);
+      my_message(ER_ERROR_ON_READ, error_message, MYF(0));
+      GRN_LOG(ctx, GRN_LOG_ERROR, "%s", error_message);
+    }
   }
 
   grn_table_sort_key *sort_keys = NULL;
@@ -8715,6 +8723,19 @@ FT_INFO *ha_mroonga::generic_ft_init_ext(uint flags, uint key_nr, String *key)
   struct st_mrn_ft_info *info =
     generic_ft_init_ext_select(flags, key_nr, key);
 
+  if (!matched_record_keys) {
+    DBUG_RETURN((FT_INFO *)info);
+  }
+  if (!info->result) {
+    char error_message[MRN_MESSAGE_BUFFER_SIZE];
+    snprintf(error_message, MRN_MESSAGE_BUFFER_SIZE,
+             "failed to create a table to store result: <%s>",
+             ctx->errbuf);
+    my_message(ER_ERROR_ON_READ, error_message, MYF(0));
+    GRN_LOG(ctx, GRN_LOG_ERROR, "%s", error_message);
+    DBUG_RETURN((FT_INFO *)info);
+  }
+
   grn_rc rc;
   rc = grn_table_setoperation(ctx, matched_record_keys, info->result,
                               matched_record_keys, operation);