Changeset 15694

Timestamp:

2008-05-26T10:21:58+12:00 (16 years ago)

Author:

davidb

Message:

Straighted out code for freeing key.dptr. Now does this properly without the memory leak that used to be in the code

File:

• gsdl/trunk/src/gdbmedit/db2txt/db2txt.cpp (modified) (2 diffs)

gsdl/trunk/src/gdbmedit/db2txt/db2txt.cpp

@@ -62 +62 @@
   int block_size = 0, i;
   GDBM_FILE dbf;
-  datum key, value;
+  datum key, value, nextkey;
       
   // sanity check
@@ -93 +93 @@
     free(value.dptr);
 
-    // free(key.dptr); Can't do this because then gdbm_nextkey() doesn't work!
-    key = gdbm_nextkey (dbf, key);
+    /* get next key */
+    nextkey = gdbm_nextkey (dbf, key);
+
+    /* free old key's dptr, otherwise causes memory leak */
+    free(key.dptr); 
+    
+    /* can now safely copy content of nextkey into key */
+    key = nextkey;
   }