File php-5.2.14-CVE-2012-1823-impr.patch of Package php-5.2.17

File php-5.2.14-CVE-2012-1823-impr.patch of Package php-5.2.17 (Revision 19)

Currently displaying revision 19, show latest

http://git.php.net/?p=php-src.git;a=commitdiff;h=000e84aa88ce16deabbf61e7086fc8db63ca88aa
Index: sapi/cgi/cgi_main.c
===================================================================
--- sapi/cgi/cgi_main.c.orig
+++ sapi/cgi/cgi_main.c
@@ -1413,10 +1413,15 @@ int main(int argc, char *argv[])
 	}
 #endif
 
-       if(query_string = getenv("QUERY_STRING")) {
+       if((query_string = getenv("QUERY_STRING")) != NULL && strchr(query_string, '=') == NULL) {
+               /* we've got query string that has no = - apache CGI will pass it to command line */
+               unsigned char *p;
                decoded_query_string = strdup(query_string);
                php_url_decode(decoded_query_string, strlen(decoded_query_string));
-               if(*decoded_query_string == '-' && strchr(query_string, '=') == NULL) {
+               for (p = decoded_query_string; *p &&  *p <= ' '; p++) {
+                       /* skip all leading spaces */
+               }
+                if(*p == '-') {
                        skip_getopt = 1;
                }
                free(decoded_query_string);
@@ -1676,7 +1681,7 @@ consult the installation file that came
 #endif /* FASTCGI */
 
 	zend_first_try {
-		while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1)) != -1) {
+		while (!skip_getopt && (c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1)) != -1) {
 			switch (c) {
 #if PHP_FASTCGI
 				case 'T':