cellog Sun May 18 23:41:08 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/phar/tests config.xml front.phar.phpt
/php-src/ext/phar/tests/files blog.phar
Modified files:
/php-src/ext/phar cgidebug phar_object.c
Log:
fix memleak, add test for previous segfault fix
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/cgidebug?r1=1.3&r2=1.3.2.1&diff_format=u
Index: php-src/ext/phar/cgidebug
diff -u php-src/ext/phar/cgidebug:1.3 php-src/ext/phar/cgidebug:1.3.2.1
--- php-src/ext/phar/cgidebug:1.3 Thu May 8 00:49:36 2008
+++ php-src/ext/phar/cgidebug Sun May 18 23:41:08 2008
@@ -1,11 +1,11 @@
#!/bin/sh
-export SCRIPT_NAME=/frontcontroller34.php
-export PATH_INFO=/start/index.php
-export
SCRIPT_FILENAME=/home/cellog/workspace/php5/ext/phar/tests/frontcontroller34.php
-export
PATH_TRANSLATED=/home/cellog/workspace/php5/ext/phar/tests/frontcontroller34.php
+export SCRIPT_NAME=/front.phar.php
+export PATH_INFO=/index.php
+export
SCRIPT_FILENAME=/home/cellog/workspace/php5/ext/phar/tests/front.phar.php
+export
PATH_TRANSLATED=/home/cellog/workspace/php5/ext/phar/tests/front.phar.php
export REDIRECT_STATUS=1
export REQUEST_METHOD=GET
-export REQUEST_URI=/frontcontroller34.php/start/index.php
+export REQUEST_URI=/front.phar.php/index.php
cd /home/cellog/workspace/php5/
ddd sapi/cgi/php-cgi &
cd /home/cellog/workspace/php5/ext/phar
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar_object.c?r1=1.266.2.5&r2=1.266.2.6&diff_format=u
Index: php-src/ext/phar/phar_object.c
diff -u php-src/ext/phar/phar_object.c:1.266.2.5
php-src/ext/phar/phar_object.c:1.266.2.6
--- php-src/ext/phar/phar_object.c:1.266.2.5 Sun May 18 23:11:24 2008
+++ php-src/ext/phar/phar_object.c Sun May 18 23:41:08 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_object.c,v 1.266.2.5 2008/05/18 23:11:24 cellog Exp $ */
+/* $Id: phar_object.c,v 1.266.2.6 2008/05/18 23:41:08 cellog Exp $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -555,16 +555,18 @@
testit = sapi_getenv("SCRIPT_NAME", sizeof("SCRIPT_NAME")-1
TSRMLS_CC);
if (!(pt = strstr(testit, basename))) {
+ efree(testit);
return;
}
path_info = sapi_getenv("PATH_INFO", sizeof("PATH_INFO")-1
TSRMLS_CC);
if (path_info) {
- entry = estrdup(path_info);
+ entry = path_info;
entry_len = strlen(entry);
spprintf(&path_info, 0, "%s%s", testit, path_info);
free_pathinfo = 1;
} else {
path_info = testit;
+ free_pathinfo = 1;
entry = estrndup("", 0);
entry_len = 0;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/config.xml?view=markup&rev=1.1
Index: php-src/ext/phar/tests/config.xml
+++ php-src/ext/phar/tests/config.xml
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/front.phar.phpt?view=markup&rev=1.1
Index: php-src/ext/phar/tests/front.phar.phpt
+++ php-src/ext/phar/tests/front.phar.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/files/blog.phar?view=markup&rev=1.1
Index: php-src/ext/phar/tests/files/blog.phar
+++ php-src/ext/phar/tests/files/blog.phar
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
