Backport locking patch from chw

tcltk · Oct 3, 2023 · 13bccc6 · 13bccc6
1 parent 56f57b3
commit 13bccc6
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
@@ -1897,7 +1897,6 @@ ZipFSCatalogFilesystem(
 	ckfree(zf);
 	return TCL_ERROR;
     }
-    Unlock();
 
     /*
      * Convert to a real archive descriptor.
@@ -2113,8 +2112,8 @@ ZipFSCatalogFilesystem(
     }
     Tcl_DStringFree(&fpBuf);
     Tcl_DStringFree(&ds);
-    Tcl_FSMountsChanged(NULL);
     Unlock();
+    Tcl_FSMountsChanged(NULL);
     return TCL_OK;
 }
 
@@ -4350,6 +4349,7 @@ ZipChannelClose(
 	info->isEncrypted = 0;
 	memset(info->keys, 0, sizeof(info->keys));
     }
+    WriteLock();
     if (info->isWriting) {
 	/*
 	 * Copy channel data back into original file in archive.
@@ -4384,7 +4384,6 @@ ZipChannelClose(
 	z->offset = 0;
 	z->crc32 = 0;
     }
-    WriteLock();
     info->zipFilePtr->numOpen--;
     Unlock();
     if (info->ubufToFree) {