[bug] avoid double-base64-encoding when -Z 2 is used, fix #219

fangq · Apr 25, 2024 · ea67ea9 · ea67ea9
1 parent 3b7e11c
commit ea67ea9
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/mcx_utils.c b/src/mcx_utils.c
@@ -4476,7 +4476,12 @@ int  mcx_jdataencode(void* vol, int ndim, uint* dims, char* type, int byte, int
     }
 
     /*compress data using zlib*/
-    ret = zmat_encode(totalbytes, (uchar*)vol, &compressedbytes, (uchar**)&compressed, zipid, &status);
+    if (zipid != zmBase64) {
+        ret = zmat_encode(totalbytes, (uchar*)vol, &compressedbytes, (uchar**)&compressed, zipid, &status);
+    } else {
+        compressed = (uchar*)vol;
+        compressedbytes = totalbytes;
+    }
 
     if (!ret) {
         if (!cfg->isdumpjson) {
@@ -4521,7 +4526,7 @@ int  mcx_jdataencode(void* vol, int ndim, uint* dims, char* type, int byte, int
         }
     }
 
-    if (compressed) {
+    if (compressed && zipid != zmBase64) {
         free(compressed);
     }