Changeset 24999 for trunk/Nebulous/nebclient/src/nebclient.c

Timestamp:

Aug 4, 2009, 2:50:13 PM (17 years ago)

Author:

jhoblitt

Message:

yet more memory mangling fun

File:

• trunk/Nebulous/nebclient/src/nebclient.c (modified) (5 diffs)

trunk/Nebulous/nebclient/src/nebclient.c

@@ -812 +812 @@
     }
 
-    nullstrncpy(stat->so_id, resultArray[0], 256);
-    nullstrncpy(stat->ext_id, resultArray[1], 256);
-    nullstrncpy(stat->read_lock, resultArray[2], 256);
+    stat->so_id     = atol(resultArray[0]);
+    stat->ext_id    = atol(resultArray[1]);
+    stat->read_lock = atoi(resultArray[2]);
     nullstrncpy(stat->write_lock, resultArray[3], 256);
     nullstrncpy(stat->epoch, resultArray[4], 256);
@@ -831 +831 @@
     }
 
-    xfree(stat->so_id);
-    xfree(stat->ext_id);
-    xfree(stat->read_lock);
-    xfree(stat->write_lock);
-    xfree(stat->epoch);
-    xfree(stat->mtime);
-    xfree(stat);
+    nebFree(stat);
 }
 
@@ -935 +929 @@
             return -1;
         }
+
+        int available = stat->available;
+        nebObjectStatFree(stat);
+
         // start at one so cull() is called one less time then the # of
         // instances
-        for (long i = 1; i < stat->available; i++) {
+        for (long i = 1; i < available; i++) {
             if (!nebCull(server, key)) {
-                nebObjectStatFree(stat);
                 return -1;
             }
             removed++;
         }
-        nebObjectStatFree(stat);
     }
 
@@ -958 +954 @@
 
 void nebFree(void *ptr) {
+    if (!ptr) { return; }
     xfree(ptr);
 }
@@ -1197 +1194 @@
     }
 
+    if (!dest) {
+        dest = xmalloc(n + 1);
+    }
+
     return strncpy(dest, src, n);
 }