Fix null ptr deref on TDB_TRACE with internal db.

[ccan] / ccan / tdb / open.c

diff --git a/ccan/tdb/open.c b/ccan/tdb/open.c
index b19e4cea293df769a588db89c71df25529d677ec..69885284c55d6abfce78b4d15d9b126a442d8ea1 100644 (file)
--- a/ccan/tdb/open.c
+++ b/ccan/tdb/open.c
@@ -159,6 +159,7 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
                errno = ENOMEM;
                goto fail;
        }
                errno = ENOMEM;
                goto fail;
        }

+

        tdb_io_init(tdb);
        tdb->fd = -1;
        tdb->name = NULL;
        tdb_io_init(tdb);
        tdb->fd = -1;
        tdb->name = NULL;


@@ -205,6 +206,10 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
                        TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: tdb_new_database failed!"));
                        goto fail;
                }
                        TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: tdb_new_database failed!"));
                        goto fail;
                }

+#ifdef TDB_TRACE
+               /* All tracing will fail.  That's ok. */
+               tdb->tracefd = -1;
+#endif

                goto internal;
        }
 
                goto internal;
        }
 


@@ -313,6 +318,20 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
                goto fail;
        }
 
                goto fail;
        }
 

+#ifdef TDB_TRACE
+       {
+               char tracefile[strlen(name) + 32];
+
+               sprintf(tracefile, "%s.trace.%u", name, getpid());
+               tdb->tracefd = open(tracefile, O_WRONLY|O_CREAT|O_EXCL, 0600);
+               if (tdb->tracefd < 0)
+                       goto fail;
+               tdb_enable_seqnum(tdb);
+               tdb_trace_open(tdb, "tdb_open", hash_size, tdb_flags,
+                              open_flags);
+       }
+#endif
+

  internal:
        /* Internal (memory-only) databases skip all the code above to
         * do with disk files, and resume here by releasing their
  internal:
        /* Internal (memory-only) databases skip all the code above to
         * do with disk files, and resume here by releasing their


@@ -328,6 +347,8 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
 
        if (!tdb)
                return NULL;
 
        if (!tdb)
                return NULL;

+
+       close(tdb->tracefd);

        
        if (tdb->map_ptr) {
                if (tdb->flags & TDB_INTERNAL)
        
        if (tdb->map_ptr) {
                if (tdb->flags & TDB_INTERNAL)


@@ -364,8 +385,9 @@ int tdb_close(struct tdb_context *tdb)
        struct tdb_context **i;
        int ret = 0;
 
        struct tdb_context **i;
        int ret = 0;
 

+       tdb_trace(tdb, "tdb_close");

        if (tdb->transaction) {
        if (tdb->transaction) {

-               tdb_transaction_cancel(tdb);
+               tdb_transaction_cancel_internal(tdb);

        }
 
        if (tdb->map_ptr) {
        }
 
        if (tdb->map_ptr) {


@@ -387,6 +409,7 @@ int tdb_close(struct tdb_context *tdb)
                }
        }
 
                }
        }
 

+       close(tdb->tracefd);

        memset(tdb, 0, sizeof(*tdb));
        SAFE_FREE(tdb);
 
        memset(tdb, 0, sizeof(*tdb));
        SAFE_FREE(tdb);