Merge pull request smihica#32 from veon82/fix_leading_slash_on_empty_…

…prefix Fix _compress(): don't add slash on filepath if prefix is an empty st…
collective-hub · Aug 20, 2021 · 6a5cd5e · 6a5cd5e
2 parents 198e6c4 + 2df6049
commit 6a5cd5e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -17,7 +17,7 @@ def read(fname):
 
 setup(
     name = 'pyminizip',
-    version = '0.2.4',
+    version = '0.2.4.1',
     description = 'A minizip wrapper - To create a password encrypted zip file in python.',
     author='Shin Aoyama',
     author_email = "[email protected]",

diff --git a/src/py_minizip.c b/src/py_minizip.c
@@ -319,8 +319,14 @@ int _compress(const char** srcs, int src_num, const char** srcspath, int srcpath
                         slash = &default_slash;
                     }
                 }
-                if (savefilepathnameinzip[filepathname_len-1] != *slash)
-                    extra_len = 1;
+
+                /* NOTE:
+                    don't add slash if filepathname_len is zero (prefix is an empty string)
+                    and avoid memory access violation */
+                if (filepathname_len > 0) {
+                    if (savefilepathnameinzip[filepathname_len-1] != *slash)
+                        extra_len = 1;
+                }
                 /* allocate buffer */
                 fullpathfileinzip = (char *)malloc(filename_len + filepathname_len + extra_len + 1);
                 if (fullpathfileinzip == NULL) {