- MFB: PECL #11216, addEmptyDir crashes if the directory already exists

diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 8a4497ea396a28d832dea8e255df82e53b3db4eb..ed9a22ad52002072c3d8e2e3daed05f0018d2be6 100644 (file)
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -996,6 +996,9 @@ static ZIPARCHIVE_METHOD(addEmptyDir)
        zval *this = getThis();
        char *dirname;
        int   dirname_len;
+       int idx;
+       struct zip_stat sb;
+       char *s;
 
        if (!this) {
                RETURN_FALSE;
@@ -1007,14 +1010,39 @@ static ZIPARCHIVE_METHOD(addEmptyDir)
                        &dirname, &dirname_len, UG(ascii_conv)) == FAILURE) {
                return;
        }
+
        if (dirname_len<1) {
                RETURN_FALSE;
        }
 
-       if (zip_add_dir(intern, (const char *)dirname) < 0) {
-               RETURN_FALSE;
+    if (dirname[dirname_len-1] != '/') {
+               s=(char *)emalloc(dirname_len+2);
+               strcpy(s, dirname);
+               s[dirname_len] = '/';
+               s[dirname_len+1] = '\0';
+    } else {
+               s = dirname;
+       }
+
+       idx = zip_stat(intern, s, 0, &sb);
+       if (idx >= 0) {
+               RETVAL_FALSE;
+       } else {
+               /* reset the error */
+               if (intern->error.str) {
+                       _zip_error_fini(&intern->error);
+               }
+               _zip_error_init(&intern->error);
+
+               if (zip_add_dir(intern, (const char *)s) == -1) {
+                       RETVAL_FALSE;
+               }
+               RETVAL_TRUE;
+       }
+
+       if (s != dirname) {
+               efree(s);
        }
-       RETURN_TRUE;
 }
 /* }}} */
 

diff --git a/ext/zip/tests/bug11216.phpt b/ext/zip/tests/bug11216.phpt
new file mode 100644 (file)
index 0000000..607217a
--- /dev/null
+++ b/ext/zip/tests/bug11216.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Bug #11216 (::addEmptyDir() crashes when the directory already exists)
+--SKIPIF--
+<?php
+/* $Id$ */
+if(!extension_loaded('zip')) die('skip');
+ ?>
+--FILE--
+<?php
+$archive = new ZipArchive();
+$archive->open('__test.zip', ZIPARCHIVE::CREATE);
+var_dump($archive->addEmptyDir('test'));
+print_r($archive);
+var_dump($archive->addEmptyDir('test'));
+$archive->close();
+unlink('__test.zip');
+?>
+--EXPECT--
+bool(true)
+ZipArchive Object
+(
+    [status] => 0
+    [statusSys] => 0
+    [numFiles] => 1
+    [filename] => 
+    [comment] => 
+)
+bool(false)