Fix memory leaks / cppcheck

TODO.txt

@@ -1,9 +1,3 @@
-* Store initial -smallfilesize / -smallfilebuffer / -pagesize values that were
-  specified when first mounted, and use them by default when reopening
-  an archive for writing. If these parameters were defined when reopening
-  an archive for writing, then store these new values. This will allow to
-  use the same parameters each time when an archive is opened for writing.
-
 * add sha256 command if crypto is enabled
 
 * Investigate an issue with -directory parameter for glob.
@@ -23,13 +17,6 @@
 * Add ability/subcommand to copy files from/to cookfs more efficiently than using 'file copy'.
   It can be something like 'cookfs copy <from disk> <cookfs endpoint>"
 
-* Add ability to get a list of pages with their properties (compression, compression level,
-  encryption, compressed size, uncompressed size)
-
-* Add ability to get information about pagesindex and fsindex (compression, compression level,
-  encryption, compressed size, uncompressed size). This will be useful for analyzing the contents
-  of a cookfs archive.
-
 * Add ability to get information about whole archive (file size, head size, cookfs size).
   It should be available from attributes to a mount point.
 

generic/fsindex.c

@@ -1621,15 +1621,20 @@ void Cookfs_FsindexForeach(Cookfs_Fsindex *i, Cookfs_FsindexForeachProc *proc, C
  */
 
 Tcl_Obj *Cookfs_FsindexGetMetadata(Cookfs_Fsindex *i, const char *paramName) {
+    CookfsLog(printf("name [%s]", paramName));
     Cookfs_FsindexWantRead(i);
     Tcl_HashEntry *hashEntry;
     hashEntry = Tcl_FindHashEntry(&i->metadataHash, paramName);
-    if (hashEntry != NULL) {
-        unsigned char *value = Tcl_GetHashValue(hashEntry);
-        return Tcl_NewByteArrayObj(value + sizeof(Tcl_Size), *((Tcl_Size *)value));
-    }  else  {
+    if (hashEntry == NULL) {
+        CookfsLog(printf("return: NULL"));
         return NULL;
     }
+    unsigned char *value = Tcl_GetHashValue(hashEntry);
+    Tcl_Obj *result = Tcl_NewByteArrayObj(value + sizeof(Tcl_Size),
+        *((Tcl_Size *)value));
+    CookfsLog(printf("return: [%s] (obj: %p)", Tcl_GetString(result),
+        (void *)result));
+    return result;
 }
 
 /*
@@ -1672,7 +1677,7 @@ Tcl_Obj *Cookfs_FsindexGetMetadataAllKeys(Cookfs_Fsindex *i) {
     {
 
         Tcl_Obj *keyObj = Tcl_NewStringObj((const char *)Tcl_GetHashKey(
-            &i->metadataHash, hPtr), -1);
+            &i->metadataHash, hPtr), -1); // cppcheck-suppress knownArgument
 
         Tcl_ListObjAppendElement(NULL, result, keyObj);
 

generic/pages.c

@@ -3212,6 +3212,7 @@ skipEncryption: ; // empty statement
 
     if (pgindexSizeCompressed == 0) {
         CookfsLog(printf("pgindex is empty and skipped"));
+        p->pagesIndex = Cookfs_PgIndexInit(0);
         goto skipPgindex;
     }
 
@@ -3250,6 +3251,11 @@ skipEncryption: ; // empty statement
         goto pgindexReadError;
     }
 
+    Cookfs_PgIndexAddPageSpecial(p->pagesIndex,
+        (Cookfs_CompressionType)pgindexCompression, pgindexCompressionLevel,
+        isIndexEncrypted, pgindexSizeCompressed, pgindexSizeUncompressed,
+        pgindexOffset, COOKFS_PGINDEX_SPECIAL_PAGE_TYPE_PGINDEX);
+
     // We have successfully read pgindex. Let's continue with fsindex.
 
     goto skipPgindex;
@@ -3303,6 +3309,11 @@ skipEncryption: ; // empty statement
         goto fsindexReadError;
     }
 
+    Cookfs_PgIndexAddPageSpecial(p->pagesIndex,
+        (Cookfs_CompressionType)fsindexCompression, fsindexCompressionLevel,
+        isIndexEncrypted, fsindexSizeCompressed, fsindexSizeUncompressed,
+        fsindexOffset, COOKFS_PGINDEX_SPECIAL_PAGE_TYPE_FSINDEX);
+
     // We have successfully read fsindex. Let's continue.
 
     goto skipFsindex;
@@ -3334,25 +3345,10 @@ skipEncryption: ; // empty statement
         fsindexSizeCompressed - COOKFS_SUFFIX_BYTES;
 
     // If we have page data, subtract the size of all pages.
-    if (p->pagesIndex != NULL) {
+    int pgindexLength = Cookfs_PgIndexGetLength(p->pagesIndex);
+    if (pgindexLength > 0) {
         p->dataInitialOffset -= Cookfs_PgIndexGetStartOffset(p->pagesIndex,
-            Cookfs_PgIndexGetLength(p->pagesIndex));
-    } else {
-        p->pagesIndex = Cookfs_PgIndexInit(0);
-    }
-
-    if (fsindexSizeCompressed != 0) {
-        Cookfs_PgIndexAddPageSpecial(p->pagesIndex,
-            (Cookfs_CompressionType)fsindexCompression, fsindexCompressionLevel,
-            isIndexEncrypted, fsindexSizeCompressed, fsindexSizeUncompressed,
-            fsindexOffset, COOKFS_PGINDEX_SPECIAL_PAGE_TYPE_FSINDEX);
-    }
-
-    if (pgindexSizeCompressed != 0) {
-        Cookfs_PgIndexAddPageSpecial(p->pagesIndex,
-            (Cookfs_CompressionType)pgindexCompression, pgindexCompressionLevel,
-            isIndexEncrypted, pgindexSizeCompressed, pgindexSizeUncompressed,
-            pgindexOffset, COOKFS_PGINDEX_SPECIAL_PAGE_TYPE_PGINDEX);
+            pgindexLength);
     }
 
     if (p->dataInitialOffset < 0) {

generic/pagesCompr.c

@@ -135,6 +135,7 @@ Tcl_Obj *Cookfs_CompressionToObj(Cookfs_CompressionType compression,
     if (compressionLevel == -1 || compressionLevel ==
         Cookfs_CompressionGetDefaultLevel(compression))
     {
+        // cppcheck-suppress knownArgument
         return Tcl_NewStringObj(Cookfs_CompressionGetName(compression), -1);
     } else {
         return Tcl_ObjPrintf("%s:%d", Cookfs_CompressionGetName(compression),

generic/pgindex.c

@@ -91,7 +91,7 @@ Tcl_Obj *Cookfs_PgIndexGetInfo(Cookfs_PgIndex *pgi, int num) {
         CookfsLog(printf("info about special page %s (#%d)",
             specialIndex == COOKFS_PGINDEX_SPECIAL_PAGE_TYPE_PGINDEX ?
                 "PGINDEX" :
-            specialIndex == COOKFS_PGINDEX_SPECIAL_PAGE_TYPE_PGINDEX ?
+            specialIndex == COOKFS_PGINDEX_SPECIAL_PAGE_TYPE_FSINDEX ?
                 "FSINDEX" :
             "UNKNOWN", specialIndex));
 
@@ -144,6 +144,7 @@ Tcl_Obj *Cookfs_PgIndexGetInfo(Cookfs_PgIndex *pgi, int num) {
             break;
         case COOKFS_PGINDEX_INFO_KEY_INDEX:
             if (num < 0) {
+                // cppcheck-suppress knownArgument
                 val = Tcl_NewStringObj(specialIndexName[specialIndex], -1);
             } else {
                 val = Tcl_NewIntObj(num);

generic/vfsAttributes.c

@@ -204,7 +204,7 @@ static int Cookfs_AttrSet_Pages(Tcl_Interp *interp, Cookfs_Vfs *vfs,
         break;
     case infList:
         result = Tcl_NewListObj(0, NULL);
-        for (int i = 0; i < length; i++) {
+        for (i = 0; i < length; i++) {
             Tcl_ListObjAppendElement(NULL, result,
                 Cookfs_PagesGetInfo(pages, i));
         }
@@ -242,6 +242,8 @@ static int Cookfs_AttrSet_Fileset(Tcl_Interp *interp, Cookfs_Vfs *vfs,
     Tcl_Obj **result_ptr = (interp == NULL ? NULL : &result);
     int rc = Cookfs_VfsFilesetSelect(vfs, value, result_ptr, result_ptr);
     CookfsLog(printf("return: %s", (rc == TCL_OK ? "OK" : "ERROR")));
+    // We Cookfs_VfsFilesetSelect() will set result via result_ptr
+    // cppcheck-suppress knownConditionTrueFalse
     if (rc != TCL_OK && interp != NULL && result == NULL) {
         result = Tcl_NewStringObj("unknown error", -1);
     }

generic/vfsCmd.c

@@ -813,6 +813,9 @@ int Cookfs_Mount(Tcl_Interp *interp, Tcl_Obj *archive, Tcl_Obj *local,
         CookfsLog(printf("prop pagesize is defined"));
     }
 
+    if (tmpObj != NULL) {
+        Tcl_BounceRefCount(tmpObj);
+    }
     tmpObj = Tcl_NewWideIntObj(props->pagesize);
     Cookfs_FsindexSetMetadata(index, pagesizeMetadataKey, tmpObj);
 
@@ -843,6 +846,9 @@ int Cookfs_Mount(Tcl_Interp *interp, Tcl_Obj *archive, Tcl_Obj *local,
         CookfsLog(printf("prop smallfilesize is defined"));
     }
 
+    if (tmpObj != NULL) {
+        Tcl_BounceRefCount(tmpObj);
+    }
     tmpObj = Tcl_NewWideIntObj(props->smallfilesize);
     Cookfs_FsindexSetMetadata(index, smallfilesizeMetadataKey, tmpObj);
 
@@ -873,6 +879,9 @@ int Cookfs_Mount(Tcl_Interp *interp, Tcl_Obj *archive, Tcl_Obj *local,
         CookfsLog(printf("prop smallfilebuffer is defined"));
     }
 
+    if (tmpObj != NULL) {
+        Tcl_BounceRefCount(tmpObj);
+    }
     tmpObj = Tcl_NewWideIntObj(props->smallfilebuffer);
     Cookfs_FsindexSetMetadata(index, smallfilebufferMetadataKey, tmpObj);