Changeset 24047 for gs2-extensions/tdb-edit/trunk/src/src/tdbset-src/tdbset.cpp

Timestamp:

2011-05-19T12:10:52+12:00 (13 years ago)

Author:

jmt12

Message:

I'd misunderstood where I needed to free the memory allocated to storing char*s in the TDB_DATA. Apparently I only have to free them when they are returned by tdb_fetch() or similar. Removed segfault causing calls to free()

File:

• gs2-extensions/tdb-edit/trunk/src/src/tdbset-src/tdbset.cpp (modified) (4 diffs)

gs2-extensions/tdb-edit/trunk/src/src/tdbset-src/tdbset.cpp

@@ -74 +74 @@
   int tdb_flags = TDB_DEFAULT; // Default = 0
   int tdb_store_flags = TDB_DEFAULT; // used later when storing
-  int open_flags = O_RDWR;
+  int open_flags = O_RDWR | O_CREAT;
   TDB_CONTEXT *tdb = tdb_open(dbname, hash_size, tdb_flags, open_flags, 0664);
   if (!tdb)
@@ -123 +123 @@
       }
 
+      // I'm responsible for freeing some memory
       delete [] concat_data;
-      free(concat_value_data.dptr);
       free(original_value_data.dptr);
     }
@@ -144 +144 @@
       cerr << "failed to set [" << argv[2] << "] to '" << argv[3] << "'" << endl;
     }
-
-    free(value_data.dptr);
   }
   // only given a key? that's a deleting
@@ -156 +154 @@
   }
 
-  free(key_data.dptr);
-
   tdb_close(tdb);