Fix

chpock · May 28, 2024 · 5910cbb · 5910cbb
1 parent d1e5ae2
commit 5910cbb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/generic/fsindexIO.c b/generic/fsindexIO.c
@@ -186,6 +186,7 @@ Cookfs_Fsindex *Cookfs_FsindexFromObject(Cookfs_Fsindex *fsindex, Tcl_Obj *o) {
 
     CookfsLog(printf("Cookfs_FsindexFromObject - Import directory done - %d vs %d", i, objLength))
     if (i < objLength) {
+        // cppcheck-suppress unreadVariable symbolName=i
         i = CookfsFsindexImportMetadata(result, bytes, objLength, i);
     }
 

diff --git a/generic/readerchannel.c b/generic/readerchannel.c
@@ -42,10 +42,6 @@ Tcl_Channel Cookfs_CreateReaderchannel(Cookfs_Pages *pages, Cookfs_Fsindex *fsin
 
     CookfsLog(printf("Cookfs_CreateReaderchannel: welcome"))
 
-    if (entry == NULL) {
-        return NULL;
-    }
-
     if (listObj != NULL) {
 
         if (Tcl_ListObjGetElements(interp, listObj, &listObjc, &listObjv) != TCL_OK) {
@@ -61,9 +57,11 @@ Tcl_Channel Cookfs_CreateReaderchannel(Cookfs_Pages *pages, Cookfs_Fsindex *fsin
             return NULL;
         }
 
-    } else {
+    } else if (entry != NULL) {
         CookfsLog(printf("Cookfs_CreateReaderchannel: init by fsindex entry [%p]", (void *)entry));
         listObjc = entry->fileBlocks * 3;
+    } else {
+        return NULL;
     }
 
     instData = Cookfs_CreateReaderchannelAlloc(pages, fsindex, listObjc);