[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zip TODO php_zip.c

[Pierre-Alain Joye]

pajoye          Sun Aug 13 00:52:59 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/zip    php_zip.c TODO 
  Log:
  - temp fix for a segfault happening when one adds two entries with 
    the same name
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.1 php-src/ext/zip/php_zip.c:1.1.2.2
--- php-src/ext/zip/php_zip.c:1.1.2.1   Fri Jul 28 13:59:06 2006
+++ php-src/ext/zip/php_zip.c   Sun Aug 13 00:52:59 2006
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_zip.c,v 1.1.2.1 2006/07/28 13:59:06 iliaa Exp $ */
+/* $Id: php_zip.c,v 1.1.2.2 2006/08/13 00:52:59 pajoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -956,6 +956,7 @@
        int entry_name_len = 0;
        struct zip_source *zs;
        long offset_start = 0, offset_len = 0;
+       int cur_idx;
 
        if (!this) {
                RETURN_FALSE;
@@ -987,7 +988,23 @@
        if (!zs) {
                RETURN_FALSE;
        }
-       if (zip_add(intern, entry_name, zs) < 0) {
+
+       cur_idx = zip_name_locate(intern, (const char *)entry_name, 0);
+       /* TODO: fix  _zip_replace */
+       if (cur_idx<0) {
+               /* reset the error */
+               if (intern->error.str) {
+                       _zip_error_fini(&intern->error);
+               }
+               _zip_error_init(&intern->error);
+
+       } else {
+               if (zip_delete(intern, cur_idx) == -1) {
+                       RETURN_FALSE;
+               }
+       }
+
+       if (zip_add(intern, entry_name, zs) == -1) {
                RETURN_FALSE;
        } else {
                RETURN_TRUE;
@@ -1006,6 +1023,7 @@
        ze_zip_object *ze_obj;
        struct zip_source *zs;
        int pos = 0;
+       int cur_idx;
 
        if (!this) {
                RETURN_FALSE;
@@ -1037,8 +1055,25 @@
                RETURN_FALSE;
        }
 
+       cur_idx = zip_name_locate(intern, (const char *)name, 0);
+       /* TODO: fix  _zip_replace */
+       if (cur_idx<0) {
+               /* reset the error */
+               if (intern->error.str) {
+                       _zip_error_fini(&intern->error);
+               }
+               _zip_error_init(&intern->error);
+
+       } else {
+               if (zip_delete(intern, cur_idx) == -1) {
+                       RETURN_FALSE;
+               }
+       }
+
        if (zip_add(intern, name, zs) == -1) {
                RETURN_FALSE;
+       } else {
+               RETURN_TRUE;
        }
 }
 /* }}} */
@@ -1916,7 +1951,7 @@
        php_info_print_table_start();
 
        php_info_print_table_row(2, "Zip", "enabled");
-       php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 
1.1.2.1 2006/07/28 13:59:06 iliaa Exp $");
+       php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 
1.1.2.2 2006/08/13 00:52:59 pajoye Exp $");
        php_info_print_table_row(2, "Zip version", "1.4.0");
        php_info_print_table_row(2, "Libzip version", "0.7.1");
 
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/TODO?r1=1.1&r2=1.1.2.1&diff_format=u
Index: php-src/ext/zip/TODO
diff -u php-src/ext/zip/TODO:1.1 php-src/ext/zip/TODO:1.1.2.1
--- php-src/ext/zip/TODO:1.1    Mon Jul 24 16:58:58 2006
+++ php-src/ext/zip/TODO        Sun Aug 13 00:52:59 2006
@@ -1,3 +1,4 @@
+- fix _zip_replace (add two entries with the same name segfaults)
 - add pattern support to extract or add files
 - stream to add or modify entries
 - crypt support for zip (read and write)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php