cvs: php-src(PHP_5_3) /ext/phar phar.c
| From: | Antony Dovgal | Date: | Wed, 09 Jul 2008 14:15:41 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/phar phar.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-50962@lists.php.net to get a copy of this message | ||
tony2001 Wed Jul 9 14:15:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar phar.c
Log:
add zero-terminator to the delimiter (and make valgrind happy)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.c?r1=1.370.2.30&r2=1.370.2.31&diff_format=u
Index: php-src/ext/phar/phar.c
diff -u php-src/ext/phar/phar.c:1.370.2.30 php-src/ext/phar/phar.c:1.370.2.31
--- php-src/ext/phar/phar.c:1.370.2.30 Fri Jun 27 01:21:12 2008
+++ php-src/ext/phar/phar.c Wed Jul 9 14:15:41 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar.c,v 1.370.2.30 2008/06/27 01:21:12 cellog Exp $ */
+/* $Id: phar.c,v 1.370.2.31 2008/07/09 14:15:41 tony2001 Exp $ */
#define PHAR_MAIN 1
#include "phar_internal.h"
@@ -102,7 +102,7 @@
{
char *tmp;
char *key, *lasts, *end;
- char ds[1];
+ char ds[2];
phar_archive_data *phar;
uint i = 0;
@@ -111,6 +111,7 @@
}
ds[0] = DEFAULT_DIR_SEPARATOR;
+ ds[1] = '\0';
tmp = estrdup(PHAR_GLOBALS->cache_list);
/* fake request startup */
@@ -3406,7 +3407,7 @@
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.30 $");
+ php_info_print_table_row(2, "CVS revision", "$Revision: 1.370.2.31 $");
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
php_info_print_table_row(2, "Tar-based phar archives", "enabled");
php_info_print_table_row(2, "ZIP-based phar archives", "enabled");