mariadb: fix crash

refs #1304 Reported by Kazuhiko Shiozaki. Thanks!!!
mroonga · Mar 7, 2012 · a5393e7 · a5393e7
1 parent 8bb2c46
commit a5393e7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/ha_mroonga.cc b/ha_mroonga.cc
@@ -2053,8 +2053,10 @@ int ha_mroonga::create_share_for_create() const
   memset(&table_share_for_create, 0, sizeof(TABLE_SHARE));
   init_alloc_root(&mem_root_for_create, 1024, 0);
   analyzed_for_create = TRUE;
-  share_for_create.table_name = table_list->table_name;
-  share_for_create.table_name_length = table_list->table_name_length;
+  if (table_list) {
+    share_for_create.table_name = table_list->table_name;
+    share_for_create.table_name_length = table_list->table_name_length;
+  }
   share_for_create.table_share = &table_share_for_create;
   table_share_for_create.comment = create_info->comment;
   table_share_for_create.connect_string = create_info->connect_string;

diff --git a/mrn_table.cc b/mrn_table.cc
@@ -177,7 +177,7 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
   if (!part_info)
     DBUG_VOID_RETURN;
 
-  if (!memcmp(table_name + table_name_length - 5, "#TMP#", 5))
+  if (table_name && !memcmp(table_name + table_name_length - 5, "#TMP#", 5))
     tmp_flg = TRUE;
 
   DBUG_PRINT("info", ("mroonga table_name=%s", table_name));
@@ -193,10 +193,11 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
           (*part_elem)->partition_name, (*sub_elem)->partition_name,
           NORMAL_PART_NAME);
         DBUG_PRINT("info", ("mroonga tmp_name=%s", tmp_name));
-        if (!memcmp(table_name, tmp_name, table_name_length + 1))
+        if (table_name && !memcmp(table_name, tmp_name, table_name_length + 1))
           DBUG_VOID_RETURN;
         if (
           tmp_flg &&
+          table_name &&
           *(tmp_name + table_name_length - 5) == '\0' &&
           !memcmp(table_name, tmp_name, table_name_length - 5)
         ) {
@@ -210,10 +211,11 @@ void mrn_get_partition_info(const char *table_name, uint table_name_length,
       create_partition_name(tmp_name, table->s->path.str,
         (*part_elem)->partition_name, NORMAL_PART_NAME, TRUE);
       DBUG_PRINT("info", ("mroonga tmp_name=%s", tmp_name));
-      if (!memcmp(table_name, tmp_name, table_name_length + 1))
+      if (table_name && !memcmp(table_name, tmp_name, table_name_length + 1))
         DBUG_VOID_RETURN;
       if (
         tmp_flg &&
+        table_name &&
         *(tmp_name + table_name_length - 5) == '\0' &&
         !memcmp(table_name, tmp_name, table_name_length - 5)
       ) {