[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/sapi/cgi/cgi_main.c trunk/sapi/cgi/cgi_main.c

[Pierre Joye]

pajoye   Fri, 30 Apr 2010 08:15:09 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=298794

Log:
- Fix #51688, ini per dir crashes when invalid document root  are given

Bug: http://bugs.php.net/51688 (Assigned) php_cgi_ini_activate_user_config() 
crashes when given apache-rewritten URL
  
Changed paths:
U   php/php-src/branches/PHP_5_3/NEWS
U   php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
U   php/php-src/trunk/sapi/cgi/cgi_main.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS   2010-04-30 04:30:52 UTC (rev 298793)
+++ php/php-src/branches/PHP_5_3/NEWS   2010-04-30 08:15:09 UTC (rev 298794)
@@ -35,6 +35,8 @@
   requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert)
 - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas)

+- Fixed bug #51688 (ini per dir crashes when invalid document root  are given).
+  (Pierre)
 - Fixed bug #51671 (imagefill does not work correctly for small images).
   (Pierre)
 - Fixed bug #51670 (getColumnMeta causes segfault when re-executing query

Modified: php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c2010-04-30 04:30:52 UTC 
(rev 298793)
+++ php/php-src/branches/PHP_5_3/sapi/cgi/cgi_main.c2010-04-30 08:15:09 UTC 
(rev 298794)
@@ -735,6 +735,10 @@

if (!IS_ABSOLUTE_PATH(path, path_len)) {
real_path = tsrm_realpath(path, NULL TSRMLS_CC);
+   /* see #51688, looks like we may get invalid path as 
doc root using cgi with apache */
+   if (real_path == NULL) {
+   return;
+   }
real_path_len = strlen(real_path);
path = real_path;
path_len = real_path_len;

Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===
--- php/php-src/trunk/sapi/cgi/cgi_main.c   2010-04-30 04:30:52 UTC (rev 
298793)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c   2010-04-30 08:15:09 UTC (rev 
298794)
@@ -735,6 +735,9 @@

if (!IS_ABSOLUTE_PATH(path, path_len)) {
real_path = tsrm_realpath(path, NULL TSRMLS_CC);
+   if (real_path == NULL) {
+   return;
+   }
real_path_len = strlen(real_path);
path = real_path;
path_len = real_path_len;

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

[PHP-CVS] svn: /php/php-src/trunk/sapi/fpm/fpm/ fpm_main.c

[Antony Dovgal]

tony2001 Fri, 30 Apr 2010 08:20:57 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=298795

Log:
merge the fix for #51688

Bug: http://bugs.php.net/51688 (Closed) php_cgi_ini_activate_user_config() 
crashes when given apache-rewritten URL
  
Changed paths:
U   php/php-src/trunk/sapi/fpm/fpm/fpm_main.c

Modified: php/php-src/trunk/sapi/fpm/fpm/fpm_main.c
===
--- php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2010-04-30 08:15:09 UTC (rev 
298794)
+++ php/php-src/trunk/sapi/fpm/fpm/fpm_main.c   2010-04-30 08:20:57 UTC (rev 
298795)
@@ -753,6 +753,9 @@

if (!IS_ABSOLUTE_PATH(path, path_len)) {
real_path = tsrm_realpath(path, NULL TSRMLS_CC);
+   if (real_path == NULL) {
+   return;
+   }
real_path_len = strlen(real_path);
path = real_path;
path_len = real_path_len;

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

[PHP-CVS] svn: /SVNROOT/ global_avail

[Philip Olson]

philip   Fri, 30 Apr 2010 16:00:00 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=298811

Log:
phd karma for Paul Jones (pmjones)

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2010-04-30 15:16:32 UTC (rev 298810)
+++ SVNROOT/global_avail2010-04-30 16:00:00 UTC (rev 298811)
@@ -39,7 +39,7 @@

 # Some people only work on PhD (The DocBook [manual] build system)
 # Those with php-src and/or phpdoc karma already have access to this
-avail|loudi,cweiske,mrkschan,moacir|phd,web/doc,web/doc-editor
+avail|loudi,cweiske,mrkschan,moacir,pmjones|phd,web/doc,web/doc-editor

 # People who work on the Engine - not people with just tests access
 
avail|andi,zeev,andrei,stas,sterling,sascha,derick,sebastian,phanto,jani,hirokawa,fujimoto,rvenkat,sesser,kalowsky,iliaa,hyanantha,georg,wez,edink,helly,hholzgra,imajes,gschlossnagle,moriyoshi,dmitry,jon,pollita,tony2001,johannes,bjori,davidw,nicholsr,wharmby,felipe,robinf,scottmac,nlopess,mattwil,colder,lbarnaud,pajoye,cseiler,dsp,shire,gron|php/php-src/*/Zend,php/php-src/*/TSRM

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