Browse Source

Weed out all BoundsChecker-found bugs

experimental/newoperator
Zeev Suraski 27 years ago
parent
commit
928e322038
  1. 1
      cgi_main.c
  2. 3
      main/SAPI.c
  3. 4
      main/main.c
  4. 1
      main/php_globals.h

1
cgi_main.c

@ -436,6 +436,7 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
php3_header(); /* Make sure headers have been sent */
php_request_shutdown((void *) 0);
php_module_shutdown();
tsrm_shutdown();
return SUCCESS;
}

3
main/SAPI.c

@ -94,7 +94,8 @@ SAPI_API void sapi_activate(SLS_D)
SG(headers_sent) = 0;
SG(read_post_bytes) = 0;
if (SG(server_context)) {
if (!strcmp(SG(request_info).request_method, "POST")) {
if (SG(request_info).request_method
&& !strcmp(SG(request_info).request_method, "POST")) {
sapi_read_post_data(SLS_C);
} else {
SG(request_info).post_data = NULL;

4
main/main.c

@ -470,7 +470,7 @@ static void php3_timeout(int dummy)
{
PLS_FETCH();
php3_error(E_ERROR, "Maximum execution time of %d seconds exceeded", PG(max_execution_time));
php3_error(E_ERROR, "Maximum execution time of %s seconds exceeded", INI_STRING("max_execution_time"));
}
#endif
@ -603,8 +603,6 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC)
zend_output_startup();
php3_set_timeout(PG(max_execution_time));
#if APACHE
/*
* For the Apache module version, this bit of code registers a cleanup

1
main/php_globals.h

@ -37,7 +37,6 @@ struct _php_core_globals {
char *safe_mode_exec_dir;
long enable_dl;
long max_execution_time;
long memory_limit;
long track_errors;

Loading…
Cancel
Save