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

[Ilia Alshanetsky]

iliaaMon, 08 Aug 2011 12:14:58 +

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

Log:
Removed deadcode

Changed paths:
U   php/php-src/branches/PHP_5_4/sapi/cgi/cgi_main.c
U   php/php-src/trunk/sapi/cgi/cgi_main.c

Modified: php/php-src/branches/PHP_5_4/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_4/sapi/cgi/cgi_main.c2011-08-08 12:13:14 UTC 
(rev 314488)
+++ php/php-src/branches/PHP_5_4/sapi/cgi/cgi_main.c2011-08-08 12:14:58 UTC 
(rev 314489)
@@ -1534,9 +1534,6 @@
var[4] == '_') {

var_len -= 5;
-   if (var_len == 0) {
-   return;
-   }
p = var + 5;
var = str = do_alloca(var_len + 1, use_heap);
*str++ = *p++;
@@ -1605,9 +1602,6 @@
var[4] == '_') {

var_len -= 5;
-   if (var_len == 0) {
-   continue;
-   }

if (var_len = alloc_size) {
alloc_size = var_len + 64;

Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===
--- php/php-src/trunk/sapi/cgi/cgi_main.c   2011-08-08 12:13:14 UTC (rev 
314488)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c   2011-08-08 12:14:58 UTC (rev 
314489)
@@ -1533,9 +1533,6 @@
var[4] == '_') {

var_len -= 5;
-   if (var_len == 0) {
-   return;
-   }
p = var + 5;
var = str = do_alloca(var_len + 1, use_heap);
*str++ = *p++;
@@ -1604,9 +1601,6 @@
var[4] == '_') {

var_len -= 5;
-   if (var_len == 0) {
-   continue;
-   }

if (var_len = alloc_size) {
alloc_size = var_len + 64;

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

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

[Rasmus Lerdorf]

rasmus   Sun, 07 Aug 2011 03:25:19 +

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

Log:
Good catch Coverity

Changed paths:
U   php/php-src/branches/PHP_5_4/sapi/cgi/cgi_main.c
U   php/php-src/trunk/sapi/cgi/cgi_main.c

Modified: php/php-src/branches/PHP_5_4/sapi/cgi/cgi_main.c
===
--- php/php-src/branches/PHP_5_4/sapi/cgi/cgi_main.c2011-08-07 02:34:03 UTC 
(rev 314394)
+++ php/php-src/branches/PHP_5_4/sapi/cgi/cgi_main.c2011-08-07 03:25:19 UTC 
(rev 314395)
@@ -689,6 +689,7 @@
free_php_self = 1;
}  else {
php_self = path_info;
+   php_self_len = path_info_len;
free_php_self = 0;
}
} else if (script_name) {

Modified: php/php-src/trunk/sapi/cgi/cgi_main.c
===
--- php/php-src/trunk/sapi/cgi/cgi_main.c   2011-08-07 02:34:03 UTC (rev 
314394)
+++ php/php-src/trunk/sapi/cgi/cgi_main.c   2011-08-07 03:25:19 UTC (rev 
314395)
@@ -689,6 +689,7 @@
free_php_self = 1;
}  else {
php_self = path_info;
+   php_self_len = path_info_len;
free_php_self = 0;
}
} else if (script_name) {

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