Print more trace when tmptable creation fails (#2517)

Also abort immediately when tmp tbl is null instead of crashing when we dereference its members. Signed-off-by: Adi Zaimi <[email protected]>
bloomberg · Oct 3, 2020 · 2581202 · 2581202
1 parent 21c2677
commit 2581202
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/bdb/cursor.c b/bdb/cursor.c
@@ -69,7 +69,6 @@ as long as there was a successful move in the past
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
 #include <limits.h>
 #include <strings.h>
 #include <assert.h>
@@ -6061,6 +6060,10 @@ static int bdb_cursor_move_int(bdb_cursor_impl_t *cur, int how, int *bdberr)
         if (cur->vs_skip == NULL) {
             assert(cur->vs_stab == NULL);
             cur->vs_stab = bdb_temp_table_create(cur->state, bdberr);
+            if (!cur->vs_stab) {
+                logmsg(LOGMSG_FATAL, "bdb_temp_table_create returns NULL, bdberr=%d", *bdberr);
+                abort();
+            }
         }
         /* Otherwise truncate it. */
         else {

diff --git a/bdb/temptable.c b/bdb/temptable.c
@@ -586,8 +586,9 @@ static struct temp_table *bdb_temp_table_create_main(bdb_state_type *bdb_state,
         parent = bdb_state;
 
     tbl = calloc(1, sizeof(struct temp_table));
-    if (tbl == NULL) {
-        *bdberr = ENOMEM;
+    if (!tbl) {
+        logmsg(LOGMSG_ERROR, "%s:%d: Failed calloc", __func__, __LINE__);
+        *bdberr = BDBERR_MALLOC;
         return NULL;
     }
 
@@ -624,16 +625,20 @@ static struct temp_table *bdb_temp_table_create_main(bdb_state_type *bdb_state,
     tbl->temp_hash_tbl = hash_init_user(hashfunc, hashcmpfunc, 0, 0);
 
     tbl->elements = calloc(tbl->max_mem_entries, sizeof(arr_elem_t));
-    if (tbl->elements == NULL) {
-        bdb_temp_table_close(parent, tbl, bdberr);
-        if (tbl->sql) free(tbl->sql);
+    if (!tbl->elements) {
+        logmsg(LOGMSG_ERROR, "%s:%d: Failed calloc sz=%lld", __func__, __LINE__,
+               (long long int)tbl->max_mem_entries * sizeof(arr_elem_t));
+        int rc = bdb_temp_table_close(parent, tbl, bdberr);
+        if (rc) {
+            logmsg(LOGMSG_ERROR, "%s:%d: bdb_temp_table_close rc=%d, bdberr=%d",
+                   __func__, __LINE__, rc, *bdberr);
+        }
+        *bdberr = BDBERR_MALLOC;
+        free(tbl->sql);
         free(tbl);
         tbl = NULL;
-        goto done;
     }
 
-done:
-
 #ifdef _LINUX_SOURCE
     if (gbl_debug_temptables) {
         char *zBacktrace = get_stack_backtrace();