Fix unpack empty strings (or pad remaining as necessary)

Smithsonian · Oct 7, 2024 · edb1605 · edb1605
1 parent e5229f0
commit edb1605
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/smax-util.c b/src/smax-util.c
@@ -1152,12 +1152,18 @@ int smaxUnpackStrings(const char *data, int len, int count, char **dst) {
     dst[i] = (char *) malloc(l+1);
     if(!dst[i]) return x_error(X_INCOMPLETE, errno, fn, "malloc() error (%d bytes)", (l+1));
 
-    memcpy(dst[i], from, l);
+    if(l) memcpy(dst[i], from, l);
     dst[i][l] = '\0'; // termination...
 
     offset += l;
   }
 
+  // Pad remaining elements with empty strings...
+  for(; i < count; i++) {
+    dst[i] = calloc(1, sizeof(char));
+    if(!dst[i]) return x_error(X_INCOMPLETE, errno, fn, "calloc() error (1x1 byte)");
+  }
+
   return X_SUCCESS;
 }