Commit efda07f8 authored by Rusty Russell's avatar Rusty Russell

Fix null ptr deref on TDB_TRACE with internal db.

parent 310a8c6d
...@@ -153,9 +153,6 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags, ...@@ -153,9 +153,6 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
unsigned char *vp; unsigned char *vp;
uint32_t vertest; uint32_t vertest;
unsigned v; unsigned v;
#ifdef TDB_TRACE
char tracefile[strlen(name) + 32];
#endif
if (!(tdb = (struct tdb_context *)calloc(1, sizeof *tdb))) { if (!(tdb = (struct tdb_context *)calloc(1, sizeof *tdb))) {
/* Can't log this */ /* Can't log this */
...@@ -322,12 +319,17 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags, ...@@ -322,12 +319,17 @@ struct tdb_context *tdb_open_ex(const char *name, int hash_size, int tdb_flags,
} }
#ifdef TDB_TRACE #ifdef TDB_TRACE
{
char tracefile[strlen(name) + 32];
sprintf(tracefile, "%s.trace.%u", name, getpid()); sprintf(tracefile, "%s.trace.%u", name, getpid());
tdb->tracefd = open(tracefile, O_WRONLY|O_CREAT|O_EXCL, 0600); tdb->tracefd = open(tracefile, O_WRONLY|O_CREAT|O_EXCL, 0600);
if (tdb->tracefd < 0) if (tdb->tracefd < 0)
goto fail; goto fail;
tdb_enable_seqnum(tdb); tdb_enable_seqnum(tdb);
tdb_trace_open(tdb, "tdb_open", hash_size, tdb_flags, open_flags); tdb_trace_open(tdb, "tdb_open", hash_size, tdb_flags,
open_flags);
}
#endif #endif
internal: internal:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment