Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/php5/patches/php5-5.2.3-suhosin-0.9.6.2.patch

    Contents of /trunk/php5/patches/php5-5.2.3-suhosin-0.9.6.2.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 262 - (show annotations) (download)
    Wed Jul 11 00:34:20 2007 UTC (16 years, 10 months ago) by niro
    File size: 94963 byte(s) 
    -suhosin security enhancement patch
    1 diff -Nura php-5.2.3/configure suhosin-patch-5.2.3-0.9.6.2/configure
    2 --- php-5.2.3/configure 2007-05-30 20:50:52.000000000 +0200
    3 +++ suhosin-patch-5.2.3-0.9.6.2/configure 2007-06-01 11:07:20.000000000 +0200
    4 @@ -17925,6 +17925,9 @@
    5
    6 fi
    7
    8 +cat >> confdefs.h <<\EOF
    9 +#define SUHOSIN_PATCH 1
    10 +EOF
    11
    12 echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
    13 echo "configure:17931: checking for declared timezone" >&5
    14 @@ -114937,7 +114940,7 @@
    15 php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
    16 strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
    17 network.c php_open_temporary_file.c php_logos.c \
    18 - output.c ; do
    19 + output.c suhosin_patch.c ; do
    20
    21 IFS=.
    22 set $ac_src
    23 @@ -115139,7 +115142,7 @@
    24 zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
    25 zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
    26 zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
    27 - zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c; do
    28 + zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_canary.c; do
    29
    30 IFS=.
    31 set $ac_src
    32 diff -Nura php-5.2.3/configure.in suhosin-patch-5.2.3-0.9.6.2/configure.in
    33 --- php-5.2.3/configure.in 2007-05-30 20:45:59.000000000 +0200
    34 +++ suhosin-patch-5.2.3-0.9.6.2/configure.in 2007-06-01 11:03:54.000000000 +0200
    35 @@ -220,6 +220,7 @@
    36 sinclude(TSRM/threads.m4)
    37 sinclude(TSRM/tsrm.m4)
    38
    39 +sinclude(main/suhosin_patch.m4)
    40
    41 divert(2)
    42
    43 @@ -1318,7 +1319,7 @@
    44 php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
    45 strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
    46 network.c php_open_temporary_file.c php_logos.c \
    47 - output.c )
    48 + output.c suhosin_patch.c )
    49
    50 PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
    51 plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c)
    52 @@ -1344,7 +1345,7 @@
    53 zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
    54 zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
    55 zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
    56 - zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c)
    57 + zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_canary.c )
    58
    59 if test -r "$abs_srcdir/Zend/zend_objects.c"; then
    60 PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c \
    61 diff -Nura php-5.2.3/ext/standard/basic_functions.c suhosin-patch-5.2.3-0.9.6.2/ext/standard/basic_functions.c
    62 --- php-5.2.3/ext/standard/basic_functions.c 2007-05-22 17:38:27.000000000 +0200
    63 +++ suhosin-patch-5.2.3-0.9.6.2/ext/standard/basic_functions.c 2007-06-01 11:03:54.000000000 +0200
    64 @@ -3560,7 +3560,9 @@
    65 PHP_FALIAS(socket_get_status, stream_get_meta_data, arginfo_stream_get_meta_data)
    66
    67 #if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
    68 - PHP_FE(realpath, arginfo_realpath)
    69 +#undef realpath
    70 + PHP_NAMED_FE(realpath, PHP_FN(real_path), arginfo_realpath)
    71 +#define realpath real_path
    72 #endif
    73
    74 #ifdef HAVE_FNMATCH
    75 diff -Nura php-5.2.3/ext/standard/dl.c suhosin-patch-5.2.3-0.9.6.2/ext/standard/dl.c
    76 --- php-5.2.3/ext/standard/dl.c 2007-02-23 01:37:35.000000000 +0100
    77 +++ suhosin-patch-5.2.3-0.9.6.2/ext/standard/dl.c 2007-06-01 11:03:54.000000000 +0200
    78 @@ -233,6 +233,19 @@
    79 RETURN_FALSE;
    80 }
    81 }
    82 +#if SUHOSIN_PATCH
    83 + if (strncmp("suhosin", module_entry->name, sizeof("suhosin")-1) == 0) {
    84 + void *log_func;
    85 + /* sucessfully loaded suhosin extension, now check for logging function replacement */
    86 + log_func = (void *) DL_FETCH_SYMBOL(handle, "suhosin_log");
    87 + if (log_func == NULL) {
    88 + log_func = (void *) DL_FETCH_SYMBOL(handle, "_suhosin_log");
    89 + }
    90 + if (log_func != NULL) {
    91 + zend_suhosin_log = log_func;
    92 + }
    93 + }
    94 +#endif
    95 RETURN_TRUE;
    96 }
    97 /* }}} */
    98 diff -Nura php-5.2.3/ext/standard/file.c suhosin-patch-5.2.3-0.9.6.2/ext/standard/file.c
    99 --- php-5.2.3/ext/standard/file.c 2007-05-27 19:33:39.000000000 +0200
    100 +++ suhosin-patch-5.2.3-0.9.6.2/ext/standard/file.c 2007-06-01 11:03:54.000000000 +0200
    101 @@ -2359,7 +2359,7 @@
    102 #if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
    103 /* {{{ proto string realpath(string path)
    104 Return the resolved path */
    105 -PHP_FUNCTION(realpath)
    106 +PHP_FUNCTION(real_path)
    107 {
    108 zval **path;
    109 char resolved_path_buff[MAXPATHLEN];
    110 diff -Nura php-5.2.3/ext/standard/file.h suhosin-patch-5.2.3-0.9.6.2/ext/standard/file.h
    111 --- php-5.2.3/ext/standard/file.h 2007-01-10 15:40:06.000000000 +0100
    112 +++ suhosin-patch-5.2.3-0.9.6.2/ext/standard/file.h 2007-06-01 11:03:54.000000000 +0200
    113 @@ -61,7 +61,7 @@
    114 PHP_FUNCTION(fd_set);
    115 PHP_FUNCTION(fd_isset);
    116 #if (!defined(__BEOS__) && !defined(NETWARE) && HAVE_REALPATH) || defined(ZTS)
    117 -PHP_FUNCTION(realpath);
    118 +PHP_FUNCTION(real_path);
    119 #endif
    120 #ifdef HAVE_FNMATCH
    121 PHP_FUNCTION(fnmatch);
    122 diff -Nura php-5.2.3/ext/standard/info.c suhosin-patch-5.2.3-0.9.6.2/ext/standard/info.c
    123 --- php-5.2.3/ext/standard/info.c 2007-04-02 14:41:07.000000000 +0200
    124 +++ suhosin-patch-5.2.3-0.9.6.2/ext/standard/info.c 2007-06-01 11:03:54.000000000 +0200
    125 @@ -627,6 +627,31 @@
    126
    127 php_info_print_table_end();
    128
    129 + /* Suhosin Patch */
    130 + php_info_print_box_start(0);
    131 + if (expose_php && !sapi_module.phpinfo_as_text) {
    132 + PUTS("<a href=\"http://www.hardened-php.net/suhosin/index.html\"><img border=\"0\" src=\"");
    133 + if (SG(request_info).request_uri) {
    134 + char *elem_esc = php_info_html_esc(SG(request_info).request_uri TSRMLS_CC);
    135 + PUTS(elem_esc);
    136 + efree(elem_esc);
    137 + }
    138 + PUTS("?="SUHOSIN_LOGO_GUID"\" alt=\"Suhosin logo\" /></a>\n");
    139 + }
    140 + PUTS("This server is protected with the Suhosin Patch ");
    141 + if (sapi_module.phpinfo_as_text) {
    142 + PUTS(SUHOSIN_PATCH_VERSION);
    143 + } else {
    144 + zend_html_puts(SUHOSIN_PATCH_VERSION, strlen(SUHOSIN_PATCH_VERSION) TSRMLS_CC);
    145 + }
    146 + PUTS(!sapi_module.phpinfo_as_text?"<br />":"\n");
    147 + if (sapi_module.phpinfo_as_text) {
    148 + PUTS("Copyright (c) 2006 Hardened-PHP Project\n");
    149 + } else {
    150 + PUTS("Copyright (c) 2006 <a href=\"http://www.hardened-php.net/\">Hardened-PHP Project</a>\n");
    151 + }
    152 + php_info_print_box_end();
    153 +
    154 /* Zend Engine */
    155 php_info_print_box_start(0);
    156 if (expose_php && !sapi_module.phpinfo_as_text) {
    157 diff -Nura php-5.2.3/ext/standard/syslog.c suhosin-patch-5.2.3-0.9.6.2/ext/standard/syslog.c
    158 --- php-5.2.3/ext/standard/syslog.c 2007-05-17 08:38:13.000000000 +0200
    159 +++ suhosin-patch-5.2.3-0.9.6.2/ext/standard/syslog.c 2007-06-01 11:03:54.000000000 +0200
    160 @@ -42,6 +42,7 @@
    161 */
    162 PHP_MINIT_FUNCTION(syslog)
    163 {
    164 +#if !SUHOSIN_PATCH
    165 /* error levels */
    166 REGISTER_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */
    167 REGISTER_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */
    168 @@ -97,6 +98,7 @@
    169 /* AIX doesn't have LOG_PERROR */
    170 REGISTER_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/
    171 #endif
    172 +#endif
    173 BG(syslog_device)=NULL;
    174
    175 return SUCCESS;
    176 diff -Nura php-5.2.3/main/fopen_wrappers.c suhosin-patch-5.2.3-0.9.6.2/main/fopen_wrappers.c
    177 --- php-5.2.3/main/fopen_wrappers.c 2007-04-18 13:58:40.000000000 +0200
    178 +++ suhosin-patch-5.2.3-0.9.6.2/main/fopen_wrappers.c 2007-06-01 11:03:54.000000000 +0200
    179 @@ -111,7 +111,7 @@
    180
    181 /* normalize and expand path */
    182 if (expand_filepath(path, resolved_name TSRMLS_CC) == NULL) {
    183 - return -1;
    184 + return -2;
    185 }
    186
    187 path_len = strlen(resolved_name);
    188 @@ -172,14 +172,20 @@
    189 }
    190 }
    191
    192 + resolved_name_len = strlen(resolved_name);
    193 if (path_tmp[path_len - 1] == PHP_DIR_SEPARATOR) {
    194 - resolved_name_len = strlen(resolved_name);
    195 if (resolved_name[resolved_name_len - 1] != PHP_DIR_SEPARATOR) {
    196 resolved_name[resolved_name_len] = PHP_DIR_SEPARATOR;
    197 resolved_name[++resolved_name_len] = '\0';
    198 }
    199 }
    200
    201 + if (resolved_name_len == resolved_basedir_len - 1) {
    202 + if (resolved_basedir[resolved_basedir_len - 1] == PHP_DIR_SEPARATOR) {
    203 + resolved_basedir_len--;
    204 + }
    205 + }
    206 +
    207 /* Check the path */
    208 #if defined(PHP_WIN32) || defined(NETWARE)
    209 if (strncasecmp(resolved_basedir, resolved_name, resolved_basedir_len) == 0) {
    210 @@ -193,7 +199,7 @@
    211 }
    212 } else {
    213 /* Unable to resolve the real path, return -1 */
    214 - return -1;
    215 + return -3;
    216 }
    217 }
    218 /* }}} */
    219 @@ -212,22 +218,44 @@
    220 char *pathbuf;
    221 char *ptr;
    222 char *end;
    223 + char path_copy[MAXPATHLEN];
    224 + int path_len;
    225 +
    226 + /* Special case path ends with a trailing slash */
    227 + path_len = strlen(path);
    228 + if (path_len >= MAXPATHLEN) {
    229 + errno = EPERM; /* we deny permission to open it */
    230 + return -1;
    231 + }
    232 + if (path_len > 0 && path[path_len-1] == PHP_DIR_SEPARATOR) {
    233 + memcpy(path_copy, path, path_len+1);
    234 + while (path_len > 0 && path_copy[path_len-1] == PHP_DIR_SEPARATOR) path_len--;
    235 + path_copy[path_len] = '\0';
    236 + path = (const char *)&path_copy;
    237 + }
    238
    239 pathbuf = estrdup(PG(open_basedir));
    240
    241 ptr = pathbuf;
    242
    243 while (ptr && *ptr) {
    244 + int res;
    245 end = strchr(ptr, DEFAULT_DIR_SEPARATOR);
    246 if (end != NULL) {
    247 *end = '\0';
    248 end++;
    249 }
    250
    251 - if (php_check_specific_open_basedir(ptr, path TSRMLS_CC) == 0) {
    252 + res = php_check_specific_open_basedir(ptr, path TSRMLS_CC);
    253 + if (res == 0) {
    254 efree(pathbuf);
    255 return 0;
    256 }
    257 + if (res == -2) {
    258 + efree(pathbuf);
    259 + errno = EPERM;
    260 + return -1;
    261 + }
    262
    263 ptr = end;
    264 }
    265 diff -Nura php-5.2.3/main/main.c suhosin-patch-5.2.3-0.9.6.2/main/main.c
    266 --- php-5.2.3/main/main.c 2007-04-18 11:38:56.000000000 +0200
    267 +++ suhosin-patch-5.2.3-0.9.6.2/main/main.c 2007-06-01 11:03:54.000000000 +0200
    268 @@ -88,6 +88,9 @@
    269
    270 #include "SAPI.h"
    271 #include "rfc1867.h"
    272 +#if SUHOSIN_PATCH
    273 +#include "suhosin_globals.h"
    274 +#endif
    275 /* }}} */
    276
    277 #ifndef ZTS
    278 @@ -1211,7 +1214,7 @@
    279
    280 /* used to close fd's in the 3..255 range here, but it's problematic
    281 */
    282 - shutdown_memory_manager(1, 1 TSRMLS_CC);
    283 + shutdown_memory_manager(1, 1 TSRMLS_CC);
    284 }
    285 /* }}} */
    286
    287 @@ -1252,6 +1255,9 @@
    288
    289 zend_try {
    290 shutdown_memory_manager(CG(unclean_shutdown), 0 TSRMLS_CC);
    291 +#if SUHOSIN_PATCH
    292 + suhosin_clear_mm_canaries(TSRMLS_C);
    293 +#endif
    294 } zend_end_try();
    295
    296 zend_try {
    297 @@ -1334,6 +1340,9 @@
    298 /* 11. Free Willy (here be crashes) */
    299 zend_try {
    300 shutdown_memory_manager(CG(unclean_shutdown) || !report_memleaks, 0 TSRMLS_CC);
    301 +#if SUHOSIN_PATCH
    302 + suhosin_clear_mm_canaries(TSRMLS_C);
    303 +#endif
    304 } zend_end_try();
    305
    306 /* 12. Reset max_execution_time */
    307 @@ -1457,6 +1466,9 @@
    308 #ifdef ZTS
    309 tsrm_ls = ts_resource(0);
    310 #endif
    311 +#if SUHOSIN_PATCH
    312 + suhosin_startup();
    313 +#endif
    314
    315 module_shutdown = 0;
    316 module_startup = 1;
    317 @@ -1586,6 +1598,10 @@
    318 REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_PATH", PHP_CONFIG_FILE_PATH, strlen(PHP_CONFIG_FILE_PATH), CONST_PERSISTENT | CONST_CS);
    319 REGISTER_MAIN_STRINGL_CONSTANT("PHP_CONFIG_FILE_SCAN_DIR", PHP_CONFIG_FILE_SCAN_DIR, sizeof(PHP_CONFIG_FILE_SCAN_DIR)-1, CONST_PERSISTENT | CONST_CS);
    320 REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
    321 +#if SUHOSIN_PATCH
    322 + REGISTER_MAIN_LONG_CONSTANT("SUHOSIN_PATCH", 1, CONST_PERSISTENT | CONST_CS);
    323 + REGISTER_MAIN_STRINGL_CONSTANT("SUHOSIN_PATCH_VERSION", SUHOSIN_PATCH_VERSION, sizeof(SUHOSIN_PATCH_VERSION)-1, CONST_PERSISTENT | CONST_CS);
    324 +#endif
    325 REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, CONST_PERSISTENT | CONST_CS);
    326 REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", LONG_MAX, CONST_PERSISTENT | CONST_CS);
    327 REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", sizeof(long), CONST_PERSISTENT | CONST_CS);
    328 @@ -1636,7 +1652,9 @@
    329 module_startup = 0;
    330
    331 shutdown_memory_manager(1, 0 TSRMLS_CC);
    332 -
    333 +#if SUHOSIN_PATCH
    334 + suhosin_clear_mm_canaries(TSRMLS_C);
    335 +#endif
    336 /* we're done */
    337 return SUCCESS;
    338 }
    339 @@ -1694,6 +1712,9 @@
    340 #ifndef ZTS
    341 zend_ini_shutdown(TSRMLS_C);
    342 shutdown_memory_manager(CG(unclean_shutdown), 1 TSRMLS_CC);
    343 +#if SUHOSIN_PATCH
    344 + suhosin_clear_mm_canaries(TSRMLS_C);
    345 +#endif
    346 core_globals_dtor(&core_globals TSRMLS_CC);
    347 #else
    348 zend_ini_global_shutdown(TSRMLS_C);
    349 diff -Nura php-5.2.3/main/php_config.h.in suhosin-patch-5.2.3-0.9.6.2/main/php_config.h.in
    350 --- php-5.2.3/main/php_config.h.in 2007-05-30 20:50:55.000000000 +0200
    351 +++ suhosin-patch-5.2.3-0.9.6.2/main/php_config.h.in 2007-06-01 11:03:54.000000000 +0200
    352 @@ -806,6 +806,9 @@
    353 /* Define if the target system has /dev/urandom device */
    354 #undef HAVE_DEV_URANDOM
    355
    356 +/* Suhosin-Patch for PHP */
    357 +#undef SUHOSIN_PATCH
    358 +
    359 /* Whether you have AOLserver */
    360 #undef HAVE_AOLSERVER
    361
    362 diff -Nura php-5.2.3/main/php.h suhosin-patch-5.2.3-0.9.6.2/main/php.h
    363 --- php-5.2.3/main/php.h 2007-01-01 10:36:11.000000000 +0100
    364 +++ suhosin-patch-5.2.3-0.9.6.2/main/php.h 2007-06-01 11:03:54.000000000 +0200
    365 @@ -40,6 +40,13 @@
    366 #undef sprintf
    367 #define sprintf php_sprintf
    368
    369 +#if SUHOSIN_PATCH
    370 +#if HAVE_REALPATH
    371 +#undef realpath
    372 +#define realpath php_realpath
    373 +#endif
    374 +#endif
    375 +
    376 /* PHP's DEBUG value must match Zend's ZEND_DEBUG value */
    377 #undef PHP_DEBUG
    378 #define PHP_DEBUG ZEND_DEBUG
    379 @@ -452,6 +459,10 @@
    380 #endif
    381 #endif /* !XtOffsetOf */
    382
    383 +#if SUHOSIN_PATCH
    384 +#include "suhosin_patch.h"
    385 +#endif
    386 +
    387 #endif
    388
    389 /*
    390 diff -Nura php-5.2.3/main/php_logos.c suhosin-patch-5.2.3-0.9.6.2/main/php_logos.c
    391 --- php-5.2.3/main/php_logos.c 2007-01-06 21:44:51.000000000 +0100
    392 +++ suhosin-patch-5.2.3-0.9.6.2/main/php_logos.c 2007-06-01 11:03:54.000000000 +0200
    393 @@ -50,6 +50,10 @@
    394 return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string));
    395 }
    396
    397 +#if SUHOSIN_PATCH
    398 +#include "suhosin_logo.h"
    399 +#endif
    400 +
    401 int php_init_info_logos(void)
    402 {
    403 if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE)
    404 @@ -58,6 +62,9 @@
    405 php_register_info_logo(PHP_LOGO_GUID , "image/gif", php_logo , sizeof(php_logo));
    406 php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
    407 php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
    408 +#if SUHOSIN_PATCH
    409 + php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo, sizeof(suhosin_logo));
    410 +#endif
    411
    412 return SUCCESS;
    413 }
    414 diff -Nura php-5.2.3/main/snprintf.c suhosin-patch-5.2.3-0.9.6.2/main/snprintf.c
    415 --- php-5.2.3/main/snprintf.c 2007-04-13 00:01:20.000000000 +0200
    416 +++ suhosin-patch-5.2.3-0.9.6.2/main/snprintf.c 2007-06-01 11:03:54.000000000 +0200
    417 @@ -1069,7 +1069,11 @@
    418
    419
    420 case 'n':
    421 +#if SUHOSIN_PATCH
    422 + zend_suhosin_log(S_MISC, "'n' specifier within format string");
    423 +#else
    424 *(va_arg(ap, int *)) = cc;
    425 +#endif
    426 goto skip_output;
    427
    428 /*
    429 diff -Nura php-5.2.3/main/spprintf.c suhosin-patch-5.2.3-0.9.6.2/main/spprintf.c
    430 --- php-5.2.3/main/spprintf.c 2007-01-01 10:36:11.000000000 +0100
    431 +++ suhosin-patch-5.2.3-0.9.6.2/main/spprintf.c 2007-06-01 11:03:54.000000000 +0200
    432 @@ -650,7 +650,11 @@
    433
    434
    435 case 'n':
    436 +#if SUHOSIN_PATCH
    437 + zend_suhosin_log(S_MISC, "'n' specifier within format string");
    438 +#else
    439 *(va_arg(ap, int *)) = xbuf->len;
    440 +#endif
    441 goto skip_output;
    442
    443 /*
    444 diff -Nura php-5.2.3/main/suhosin_globals.h suhosin-patch-5.2.3-0.9.6.2/main/suhosin_globals.h
    445 --- php-5.2.3/main/suhosin_globals.h 1970-01-01 01:00:00.000000000 +0100
    446 +++ suhosin-patch-5.2.3-0.9.6.2/main/suhosin_globals.h 2007-06-01 11:03:54.000000000 +0200
    447 @@ -0,0 +1,61 @@
    448 +/*
    449 + +----------------------------------------------------------------------+
    450 + | Suhosin-Patch for PHP |
    451 + +----------------------------------------------------------------------+
    452 + | Copyright (c) 2004-2006 Stefan Esser |
    453 + +----------------------------------------------------------------------+
    454 + | This source file is subject to version 2.02 of the PHP license, |
    455 + | that is bundled with this package in the file LICENSE, and is |
    456 + | available at through the world-wide-web at |
    457 + | http://www.php.net/license/2_02.txt. |
    458 + | If you did not receive a copy of the PHP license and are unable to |
    459 + | obtain it through the world-wide-web, please send a note to |
    460 + | license@php.net so we can mail you a copy immediately. |
    461 + +----------------------------------------------------------------------+
    462 + | Author: Stefan Esser <sesser@hardened-php.net> |
    463 + +----------------------------------------------------------------------+
    464 + */
    465 +
    466 +#ifndef SUHOSIN_GLOBALS_H
    467 +#define SUHOSIN_GLOBALS_H
    468 +
    469 +typedef struct _suhosin_patch_globals suhosin_patch_globals_struct;
    470 +
    471 +#ifdef ZTS
    472 +# define SPG(v) TSRMG(suhosin_patch_globals_id, suhosin_patch_globals_struct *, v)
    473 +extern int suhosin_patch_globals_id;
    474 +#else
    475 +# define SPG(v) (suhosin_patch_globals.v)
    476 +extern struct _suhosin_patch_globals suhosin_patch_globals;
    477 +#endif
    478 +
    479 +
    480 +struct _suhosin_patch_globals {
    481 + /* logging */
    482 + int log_syslog;
    483 + int log_syslog_facility;
    484 + int log_syslog_priority;
    485 + int log_sapi;
    486 + int log_script;
    487 + int log_phpscript;
    488 + char *log_scriptname;
    489 + char *log_phpscriptname;
    490 + zend_bool log_phpscript_is_safe;
    491 + zend_bool log_use_x_forwarded_for;
    492 +
    493 + /* memory manager canary protection */
    494 + unsigned int canary_1;
    495 + unsigned int canary_2;
    496 + unsigned int canary_3;
    497 + unsigned int dummy;
    498 +};
    499 +
    500 +
    501 +#endif /* SUHOSIN_GLOBALS_H */
    502 +
    503 +/*
    504 + * Local variables:
    505 + * tab-width: 4
    506 + * c-basic-offset: 4
    507 + * End:
    508 + */
    509 diff -Nura php-5.2.3/main/suhosin_logo.h suhosin-patch-5.2.3-0.9.6.2/main/suhosin_logo.h
    510 --- php-5.2.3/main/suhosin_logo.h 1970-01-01 01:00:00.000000000 +0100
    511 +++ suhosin-patch-5.2.3-0.9.6.2/main/suhosin_logo.h 2007-06-01 11:03:54.000000000 +0200
    512 @@ -0,0 +1,178 @@
    513 +static unsigned char suhosin_logo[] =
    514 + "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48"
    515 + "\x00\x48\x00\x00\xff\xe1\x00\x16\x45\x78\x69\x66\x00\x00\x4d\x4d"
    516 + "\x00\x2a\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\xff\xdb\x00\x43"
    517 + "\x00\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
    518 + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
    519 + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
    520 + "\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"
    521 + "\x01\xff\xc0\x00\x0b\x08\x00\x27\x00\x71\x01\x01\x22\x00\xff\xc4"
    522 + "\x00\x1e\x00\x00\x02\x02\x02\x03\x01\x01\x00\x00\x00\x00\x00\x00"
    523 + "\x00\x00\x00\x00\x09\x06\x08\x05\x07\x02\x03\x0a\x01\x04\xff\xc4"
    524 + "\x00\x32\x10\x00\x01\x04\x03\x00\x02\x00\x05\x01\x05\x09\x01\x00"
    525 + "\x00\x00\x00\x05\x02\x03\x04\x06\x01\x07\x08\x00\x09\x11\x12\x13"
    526 + "\x14\x21\x15\x0a\x16\x31\x56\x96\x17\x18\x19\x23\x32\x41\x58\x98"
    527 + "\xd4\xd6\xff\xda\x00\x08\x01\x01\x00\x00\x3f\x00\xf4\xc1\xe1\xe5"
    528 + "\x69\xe9\x3e\xb9\xd1\x7c\x8a\x2e\x9d\x66\xe8\x3b\x29\x4d\x7f\x46"
    529 + "\xba\x58\x55\x54\x8d\xb1\x5f\xaa\xd9\x8d\x51\x2b\xb6\x27\x5a\x69"
    530 + "\xd1\x43\xaf\x16\x1a\xf0\xb2\xb1\xe9\x6d\x9f\xc2\xa4\x36\x18\xb5"
    531 + "\x85\x10\x41\xbe\xfc\x09\xac\x49\x29\x11\xd4\x32\x97\xec\x08\x13"
    532 + "\xc1\x2d\x20\xc3\x59\xeb\x26\x05\xd8\x6b\x76\x31\x43\x8f\x57\xcf"
    533 + "\x84\x9f\x14\xa8\x53\x81\x0b\xc3\x64\x80\xa3\x02\x0a\x41\x75\xf8"
    534 + "\x44\x85\x93\x81\x22\x3c\xd8\x13\xe1\xbe\xf4\x59\x91\x1f\x6a\x44"
    535 + "\x77\x5c\x69\xc4\x2f\x39\x5f\x0f\x2a\x8d\xeb\xba\xf8\xc3\x56\x6c"
    536 + "\x3b\x36\xa7\xda\xbd\x4d\xa1\xb5\x4e\xc6\xa7\xa4\x3a\xec\x15\x2d"
    537 + "\xa5\xb3\xea\x5a\xdc\xac\x46\xac\x01\x60\xd8\x43\xc8\x8e\x8b\xb1"
    538 + "\x40\x4c\x95\x8b\x34\x41\x28\x52\x91\x28\x43\xd3\xa3\xb6\xa7\x55"
    539 + "\x15\xe7\x5a\x96\xcb\xf1\xda\xe5\x55\xee\xfe\x1e\xbd\xd9\x41\xd3"
    540 + "\x28\xfd\x97\xca\x57\x2b\x85\x9c\xa4\x30\x95\xaa\xa5\x57\xa2\x35"
    541 + "\x15\x86\xcb\x61\x34\x41\xe4\xc7\x80\x20\x18\x21\x17\x09\x85\x0b"
    542 + "\x14\x9d\x21\x68\x62\x1c\x08\x11\x64\x4b\x92\xf2\xd2\xd3\x2d\x2d"
    543 + "\x6a\xc2\x73\x6b\x3c\x3c\x8b\x9e\xbc\x52\xaa\xa4\xab\x81\x6c\xf6"
    544 + "\xfa\xbd\x70\xc5\xc6\x7b\xc2\xaa\x22\x4f\x58\x04\x87\x25\x6a\x27"
    545 + "\x1d\xa4\x3d\x20\x75\x72\x01\x09\x71\xe5\x1c\x9e\xc3\x2e\x36\xf3"
    546 + "\xd0\xc6\x35\x2a\x43\x4d\x2d\x0e\x2d\xb4\xa1\x49\xce\x65\x1e\x52"
    547 + "\x9e\xa1\xf6\x09\xcc\xdc\x63\x66\xa8\x01\xe9\x3b\x0d\xd7\x5a\x85"
    548 + "\xbb\xc5\x65\xc0\x7b\x2e\x46\xa9\xd9\x56\x1d\x4c\x92\x72\x26\x4e"
    549 + "\x86\xd5\x68\xae\xc4\xaa\x55\xce\xd7\x83\x59\xb3\x81\xee\xce\x74"
    550 + "\x39\x39\x31\x9f\x8a\x25\xe8\xa5\xa5\xe5\x81\xf2\x11\x23\xcb\xa1"
    551 + "\x1e\x43\x12\xe3\xb1\x2a\x2b\xcd\xc8\x8d\x25\x96\xa4\x47\x7d\x95"
    552 + "\xa5\xc6\x9f\x61\xe4\x25\xc6\x5e\x69\xc4\xe7\x29\x5b\x6e\xb6\xa4"
    553 + "\xad\x0b\x4e\x72\x95\x25\x58\x56\x33\x9c\x67\xce\xef\x0f\x17\xbf"
    554 + "\x4c\x7b\x2d\xe6\xfe\x76\x35\x27\x5a\x07\x97\x67\xe8\xae\x8d\x71"
    555 + "\x0f\xb2\x13\x99\xb9\xbc\x14\xad\xb3\xb7\xe6\x11\x6f\xe0\xda\x58"
    556 + "\xb1\x08\xac\xa6\x6c\x2d\x7f\x05\xb7\x56\xd2\xe6\xcf\xbb\x4d\x0c"
    557 + "\xe3\x50\xb2\xec\x91\xf0\x4a\xb8\xd6\x22\xb8\xa7\xf6\x67\xaf\xcf"
    558 + "\x63\x7e\xd7\xe7\x42\xd8\xbd\xc3\x71\xa1\xf2\x7e\x9b\xa8\x97\x83"
    559 + "\x6e\xd1\xdc\x4b\x06\x11\x2d\xae\x26\x61\x98\x72\x10\xf4\x42\x5d"
    560 + "\x20\x4a\xa3\x73\xd7\xf2\xcd\x3c\x48\x32\xe4\x03\x9f\x80\x37\x08"
    561 + "\x36\x11\xd0\xcb\x97\x6c\x08\xed\x6d\x33\x24\xa2\x1b\xb4\x77\xdf"
    562 + "\x61\x5d\x5f\xc1\x43\xc2\x82\xeb\x0f\x5d\x84\x08\x68\xaa\xa4\x01"
    563 + "\xe1\x19\xdf\xbc\x31\x65\xfe\xd1\xf5\x7d\x7a\xb2\x2a\x33\x50\x21"
    564 + "\x2a\x56\x9d\xb1\x81\xab\xdb\x35\x78\x30\x83\xd9\x89\x1d\x31\xac"
    565 + "\x96\x14\x07\x61\xbc\x20\x68\x42\x85\x33\x19\xac\xbe\xdb\x34\x56"
    566 + "\xf1\xd5\xfd\x29\xa9\x28\xdb\xcb\x4c\x5a\x23\xdc\xf5\x96\xc5\x10"
    567 + "\xa3\x35\x5b\x14\x68\xd3\x61\x62\x64\x76\x26\xcb\x17\x3e\x34\x98"
    568 + "\x04\xa3\xc4\x20\x38\x90\x92\xe3\xc8\x07\x2c\x36\x74\x66\x26\x0e"
    569 + "\x29\x02\x64\x29\x2d\x21\xe6\x16\x9c\x6b\xce\xa3\x89\xd9\x4f\xd3"
    570 + "\xc4\xbd\xc5\x87\x79\x9c\x65\xf6\x39\x45\x60\xe8\xce\x9e\xab\x6d"
    571 + "\x13\x15\x22\xe1\x5e\x4b\x38\x42\xc4\x1e\xd5\x76\xe0\xc5\xeb\x85"
    572 + "\x07\x2d\x0f\xb8\xb6\xa6\xd6\x6d\x71\x0d\xa2\x43\x4c\x25\xea\xfa"
    573 + "\xa1\xae\x4c\xe4\x7d\xbd\x76\xa9\xfb\x06\xc2\x83\x42\xeb\xad\xe7"
    574 + "\xe9\x5f\x68\x6f\xba\xfb\x2f\x07\xce\xb8\x13\xc1\x9b\xeb\xb0\x76"
    575 + "\x45\x57\x28\x7b\xea\xbe\x0f\xf4\x30\x7b\xa0\xed\xe4\x22\x93\x21"
    576 + "\xfc\xbc\xe0\xb9\x75\xc1\x4f\xfc\xef\xb6\xfa\xa1\xfc\x64\xa1\x4a"
    577 + "\x82\xc7\x33\xad\x75\xed\x82\xbd\x3d\xdb\xf7\xa8\xbe\x5e\xbb\x36"
    578 + "\x62\x04\x9a\x2e\xc5\xd9\x9e\x9c\x3a\x0b\x98\x0b\x57\xac\xf1\x24"
    579 + "\x62\x58\x83\x15\x5b\xa6\xf2\xda\x34\x70\x03\xce\x0f\x93\x1b\x12"
    580 + "\xc7\xce\x54\x87\x33\x15\xd6\x53\x25\x1f\x2a\x90\x87\x12\xe3\x78"
    581 + "\xef\x55\x77\x4d\x4a\xd8\x7e\xef\xd2\xfd\xd1\xaf\x3a\xaf\x55\xdb"
    582 + "\x6a\x2d\x3d\x42\xac\x51\x79\xee\x91\xab\xe1\x05\x2d\x3c\x80\xa2"
    583 + "\x43\xad\x22\x2e\xd5\x33\x13\xa4\x9e\x00\xe0\x04\x10\x84\xc8\xf2"
    584 + "\x19\x30\x92\x1f\xaa\xc3\x28\xc9\x76\x30\x3f\xe9\x10\x61\x5e\x79"
    585 + "\xd5\xf7\xdf\xd0\x54\xdb\xae\xb6\xae\xfa\xe8\xa3\x57\xe0\x6c\x2d"
    586 + "\xf7\xbd\x49\xd6\x6e\x76\x79\xcc\x54\x0c\x5f\xff\x00\xbb\x06\x98"
    587 + "\xa6\x9e\x89\x61\xb4\x6f\xc3\xe3\x6a\xc2\x4f\x59\x03\xc9\x80\x2c"
    588 + "\x59\x24\x44\x70\x38\xd5\x96\x6a\x9e\x8b\x81\x64\xe5\xbc\xa0\x3c"
    589 + "\x33\xaf\x17\x9d\xff\x00\x71\x1a\xd1\x3a\x80\x66\xb3\xd9\x31\x77"
    590 + "\x0d\x12\xbd\xae\x29\xb5\x6a\xd6\xcf\x8d\x68\x87\x75\xcd\xe8\x65"
    591 + "\x5a\xbe\x3c\x04\x7b\x34\xdb\x54\x19\xa4\x63\x9c\x2a\x5d\x23\xbe"
    592 + "\xf4\xb1\x1c\x4d\x90\xec\x92\x2f\x49\x71\xf7\x14\xf2\x97\x9f\x15"
    593 + "\x57\xed\x13\x21\x2a\xf5\x33\xd1\x2a\x52\x52\xac\xb7\x62\xd1\xcb"
    594 + "\x46\x73\x8c\x67\x28\x56\x77\x86\xbf\x6f\x2a\x4e\x73\xfe\x95\x65"
    595 + "\x0b\x5a\x3e\x38\xfc\xfc\xaa\x56\x3f\x86\x73\xe3\xb9\x4a\x52\x84"
    596 + "\xa5\x08\x4e\x12\x94\x27\x09\x4a\x53\x8c\x61\x29\x4a\x71\xf0\x4a"
    597 + "\x53\x8c\x7e\x31\x8c\x63\x18\xc6\x31\x8f\xc6\x31\xf8\xc7\x9f\x7c"
    598 + "\xd5\xbb\xae\x5e\xe2\x1f\xab\x6e\x24\x34\x00\x8a\x25\x83\x70\x40"
    599 + "\x1c\xcc\xda\x45\x7f\x66\x4e\x30\x2e\x94\x7e\x74\x49\xf0\xe4\x4e"
    600 + "\x06\x5c\xa8\x2f\x89\x21\x2e\x98\x0e\xd9\x21\xc2\x0b\x21\x0f\xc4"
    601 + "\x16\x6e\x48\xd9\xe4\xe3\x4a\x19\x1e\x64\x67\x54\xff\x00\x3a\x6d"
    602 + "\x4f\x62\xb5\x00\x4a\xaa\x51\xfd\x2d\xe8\x0e\x6c\xaf\xc6\x7d\x6d"
    603 + "\xc8\x88\xc7\x67\xea\x8a\x58\x02\x73\xe3\x65\x4d\xc9\x24\xc0\x3d"
    604 + "\x57\xa3\x2e\x53\x16\x99\x4f\xe5\xe7\x19\x97\x3e\x3b\xcf\xc9\x4b"
    605 + "\x99\x7f\x33\x25\xa5\xdf\xba\x77\x2b\xd3\x3e\xc2\x7b\x8b\x94\x07"
    606 + "\xe9\x52\x5b\x43\x87\x34\x14\x86\x37\xcf\x41\x6b\x8e\x6a\xa5\x22"
    607 + "\xab\xdb\x96\xa2\xcf\x46\xd8\x9b\x45\x93\xef\xd6\xdf\x3e\x99\x9c"
    608 + "\x7e\x29\x10\x6b\x6c\xa2\xb8\x43\x05\x09\x44\x70\x8c\xb8\xaa\x54"
    609 + "\x7c\x30\x36\x5e\x1c\x5e\x5b\x9f\x6c\x0d\x81\xee\xa0\x93\x8d\x67"
    610 + "\x55\xf3\x87\xaf\xaa\x6b\x58\xf9\xbe\xb2\x36\x07\x42\x6e\xbd\x96"
    611 + "\xe3\x9f\x1f\x8f\xc9\xf4\x9d\xae\x6a\x7d\x4c\x96\xbe\x5f\xc7\xcd"
    612 + "\xf3\xb2\xf7\xcd\xf0\xcf\xc3\xe4\xf8\xfe\x37\x4f\x1c\x4d\xf6\x40"
    613 + "\xf1\x6b\x7c\x4e\xe0\xa6\x71\xad\x56\xa7\x1c\x5c\x15\x6b\xfc\xf3"
    614 + "\x01\x5d\xac\xf1\x75\x9a\x72\x6b\xaa\x28\xc5\x88\x6d\xfb\x33\x85"
    615 + "\xe0\x4e\x61\xab\xeb\x31\x2c\x71\x08\x73\x11\x3b\xfc\xb5\xc0\x96"
    616 + "\xcc\x87\x24\x44\xb5\x9b\x9e\xb3\x71\xba\xe9\xed\xb1\x4e\xd7\x76"
    617 + "\x6c\xd2\xb6\x05\xb7\x5a\xde\xeb\x34\x5b\x96\x16\xfb\x59\xa9\x5c"
    618 + "\x4f\x55\xca\x8a\xac\x59\xb0\xe4\x54\x39\x25\xbc\x81\x37\x2a\x09"
    619 + "\x5f\x9e\x3b\x6b\x7d\x1f\x69\xf3\x34\x85\x39\x84\xa7\x28\x0b\xd3"
    620 + "\xfd\xfb\x4b\x7a\xea\xe7\xd2\x3c\xd3\xda\x15\x68\xbc\x73\xd3\x22"
    621 + "\x6f\xd7\x72\x5b\x2b\x66\xee\xa8\x0d\x54\xe8\x5b\xf9\x92\x96\x92"
    622 + "\x93\xea\x97\x4a\xc7\x43\x10\x46\x35\xc5\xc0\x60\x8a\xe4\xc1\xb5"
    623 + "\x36\xc6\xae\xed\xf7\x70\xa5\x86\x99\x3d\x91\xf8\xfd\x4e\x53\xeb"
    624 + "\xbb\xbd\x6d\xec\x8f\xd7\x89\x3d\x31\x7f\xd7\x78\xba\x50\xbb\x74"
    625 + "\x9d\xf6\xac\x4e\xb9\x03\x9c\x79\xd5\xe1\xbd\x17\x68\xd9\x13\x0b"
    626 + "\x45\x75\x88\x00\x1d\x1f\xae\x73\x6a\x1d\x5c\x6e\x44\x9f\xa6\xfa"
    627 + "\x4e\xd8\x25\x8b\xc0\xbc\xb2\x99\xe3\x17\x24\xb3\x23\xe2\x48\x8b"
    628 + "\xfa\x22\xe7\x7e\x8f\xe6\x3f\x5f\x55\x0d\x75\xd3\x51\x0b\xd7\xed"
    629 + "\xd3\x6f\x97\x3b\x85\x42\x80\x7e\x5f\xdc\x1b\xd6\xba\xee\xc4\x80"
    630 + "\xce\x06\xa9\x15\x8c\x97\x5f\x40\x69\xb2\x4d\xc5\xb2\x5c\x1e\x01"
    631 + "\x87\x7e\xe0\x36\x6d\x78\x80\x4e\x3c\x02\xec\x90\x1d\x11\x81\x74"
    632 + "\xa5\x8b\xa4\xa0\x56\x06\xd5\x79\x72\x85\x57\x3b\xb2\x2e\xae\x90"
    633 + "\x18\x8d\x91\xb2\x0e\x44\x19\xaa\xb4\xcc\x08\xed\x46\xfa\xd7\x2b"
    634 + "\x78\x58\x72\x5d\xbb\x5e\x49\xe7\xee\xf3\x8a\x9d\x22\xa4\x19\xc8"
    635 + "\xe7\x08\xc3\x90\x9b\x35\x9a\xa4\x25\x8c\x4b\x9b\xa7\xf8\xbf\x81"
    636 + "\xf5\xdf\x22\x66\xf1\x7e\x9f\x66\x3d\xbb\xfa\x73\x73\x4d\xfd\x67"
    637 + "\x7b\xf4\xce\xc3\x62\x2e\x6f\xbb\x0c\xa2\xdc\x69\xfc\x8a\x17\x0e"
    638 + "\x3a\x9e\x83\x46\xd7\xe3\x5e\x65\x86\xc0\x51\x00\xbb\x91\xe3\xe1"
    639 + "\xc1\x16\xc4\xe9\x65\x5c\x14\x3e\x44\x6a\x6b\xd1\x1e\xb0\x36\xdd"
    640 + "\x0b\x7d\x8a\xeb\xaf\x58\x5b\x64\x3f\x38\xed\x52\x76\xe8\x46\xf7"
    641 + "\x86\x84\xb3\x93\xb1\x0b\xe5\xfd\xfd\x0d\xe9\x6d\xe4\xf1\x1b\x1d"
    642 + "\x56\xb4\x34\xe4\x6a\xf5\xa4\x9c\x2c\xc9\x64\x94\xc1\xf5\x79\x6d"
    643 + "\x12\x96\xf3\x47\xc5\x48\xa8\xdb\xd8\x95\x64\x29\xcf\xf6\x88\xf1"
    644 + "\x95\x7a\x98\xe8\xbc\x27\x19\xce\x73\x61\xd1\xb8\xc6\x31\x8c\xe7"
    645 + "\x39\xce\x77\x9e\xbc\xc6\x31\x8c\x63\xf3\x9c\xe7\x39\xc6\x31\x8f"
    646 + "\xf7\xce\x7e\x1e\x3b\x7f\x0f\x0f\x0f\x13\x57\xb9\x0a\xe1\x0b\x64"
    647 + "\x5f\x58\x40\xc6\xc7\x7a\x4b\xf2\x3d\xbc\x71\xf4\xa7\xd2\xca\x14"
    648 + "\xe2\x98\x1a\x30\x1e\xe0\x26\x5a\x6a\xf0\x9c\x67\x38\x66\x00\xb8"
    649 + "\x72\xe6\xbe\xac\xfe\x12\xd3\x0b\x56\x73\x8c\x63\xc7\x2b\xe1\xe2"
    650 + "\xe8\xdd\x7b\xff\x00\xd8\xe5\x23\x6c\xce\xa8\x69\xcf\x5e\x3a\xef"
    651 + "\x77\xea\xe5\xab\x0e\x82\xdb\xd9\xed\x7a\x9e\xb8\x6d\x51\x32\xdb"
    652 + "\x79\xc3\x36\x9a\x2d\xa3\x50\x39\x65\x0a\x63\x0e\xe5\xd4\x39\x12"
    653 + "\xbf\x8b\x98\xa4\xa1\x2d\xad\xb3\xcf\x65\x6a\x43\x78\xb3\x3b\x07"
    654 + "\xd8\xd5\xea\xae\x76\xad\x6f\xf5\xff\x00\xca\x93\xab\x96\xb0\x64"
    655 + "\xeb\xd6\x4a\xd5\x87\xba\xec\x24\x60\x97\x06\x76\x03\xe3\x4c\x07"
    656 + "\x29\x11\x8e\x34\x25\x02\x64\x29\xf0\x25\x48\x85\x3a\x33\x8b\x7a"
    657 + "\x3c\x86\x1e\x75\xa5\x61\xc6\x97\x9f\x8d\x25\xf5\xc9\xcd\xde\xc9"
    658 + "\x7d\x77\xf2\xc8\x7e\x70\xaf\x73\x5f\x2d\xec\xa2\x51\x2d\x96\xfb"
    659 + "\x89\xad\x80\x57\xb2\x36\x1d\x7d\x83\x45\xac\xf3\xdb\xcc\x6c\x31"
    660 + "\x4f\xcf\x30\x58\xd0\x12\x28\x90\x50\x42\x86\xfb\x48\x16\x3c\xc5"
    661 + "\x9c\xf8\xe7\xcc\x29\x88\xb3\x4a\x4b\x4e\x6c\xbc\xdb\xc7\xbb\xe9"
    662 + "\xb6\xa0\x8b\x11\xa1\x7d\x73\xd7\xe9\xbf\x7e\xc2\x6c\x10\x8d\xee"
    663 + "\x9d\xef\x63\x3a\xe0\xf5\xbe\x8c\x3e\xa1\xc7\xc5\xd1\x00\x44\x1e"
    664 + "\xf3\x51\xf2\xe2\xb0\xe3\xb5\x13\x7f\x32\xf1\x8c\xa6\x22\xfe\x1f"
    665 + "\x49\x4d\xbb\xcf\x3a\x5d\xed\x4c\xd2\xfc\x85\xed\x23\xd6\xc7\x50"
    666 + "\xb6\x5b\x3a\x16\x83\xb8\x6f\xfd\x32\x3f\xaa\x36\x34\xbb\xf5\x96"
    667 + "\xa9\xab\xcf\x9f\x8f\xac\xc3\xca\xd5\x8b\xd8\x48\x9e\x79\xaa\x30"
    668 + "\x87\xca\x58\x4d\x59\x96\xb9\x4f\xc5\x1b\x1c\xd2\xda\x5b\xe6\x57"
    669 + "\x29\xa1\x28\x7a\x2b\x5b\xff\x00\x12\x2f\x5e\x3f\xf3\xbb\x8e\x7f"
    670 + "\xec\xc6\x98\xff\x00\xed\x3c\xa6\xdd\xa9\xdc\x7e\xa0\xf7\xd6\x99"
    671 + "\x31\xa2\xf7\xaf\x6b\xe9\x82\x74\x4b\x3d\x8f\x5e\x58\x0b\x33\xab"
    672 + "\xef\xc3\xaf\x84\x64\xb9\xae\xb6\x25\x5f\x62\x8f\x1c\xe3\xf4\x51"
    673 + "\xb7\x96\xe3\x0e\x30\x42\xa9\x18\x39\xbf\x9e\x2a\x1f\x74\x19\x02"
    674 + "\x2d\x43\x93\x06\x63\xb1\xa7\x47\x6a\xfa\x9b\x6c\xeb\xbd\xe9\xae"
    675 + "\x6a\x7b\x6f\x53\x5a\x60\x5d\xb5\xcd\xe8\x67\xeb\x35\x3b\x48\xc6"
    676 + "\xa6\xb3\x04\xc8\xdf\xb8\x7e\x26\x64\xb0\xc9\x18\xb0\xa7\x33\xf2"
    677 + "\x4a\x8b\x22\x3b\x8d\x4b\x89\x1d\xf6\x9d\x65\xc4\x38\xd2\x54\x9c"
    678 + "\xe3\xcd\x89\xe1\xe1\xe6\x3e\x70\x81\x45\x1d\x18\xf9\x31\x83\xc8"
    679 + "\xbe\x14\x82\x4b\x87\x7a\x74\x28\xd2\xdd\x12\x55\x30\xe6\x0e\x49"
    680 + "\x31\x8e\x48\x69\xc5\xc0\x20\x91\xe4\x48\x41\x4c\xd8\xb9\x6a\x4e"
    681 + "\x21\xce\x99\x1b\x0e\xfd\x09\x4f\xa1\x79\x0f\x0f\x0f\x0f\x0f\x0f"
    682 + "\x0f\x3f\x3c\xb8\x71\x27\xc7\x72\x24\xe8\xb1\xa6\xc5\x7b\x18\xc3"
    683 + "\xb1\xa5\xb0\xd4\x98\xee\xe3\x19\xc6\x71\x87\x19\x79\x2b\x6d\x78"
    684 + "\xc6\x71\x8c\xe3\x0a\x4e\x71\x8c\xe3\x19\xfe\x38\xf2\x3b\xfb\x8b"
    685 + "\x48\xfe\x4e\xaa\xff\x00\x4f\x08\xff\x00\xc7\xe1\xfb\x8b\x48\xfe"
    686 + "\x4e\xaa\xff\x00\x4f\x08\xff\x00\xc7\xe4\x95\x86\x18\x8a\xcb\x31"
    687 + "\xa3\x32\xd4\x78\xf1\xdb\x43\x2c\x47\x61\xb4\x32\xcb\x2c\xb4\x9c"
    688 + "\x21\xb6\x99\x69\xbc\x25\xb6\xdb\x6d\x18\xc2\x10\xda\x12\x94\xa1"
    689 + "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9"
    690 + ;
    691 diff -Nura php-5.2.3/main/suhosin_patch.c suhosin-patch-5.2.3-0.9.6.2/main/suhosin_patch.c
    692 --- php-5.2.3/main/suhosin_patch.c 1970-01-01 01:00:00.000000000 +0100
    693 +++ suhosin-patch-5.2.3-0.9.6.2/main/suhosin_patch.c 2007-06-01 11:03:54.000000000 +0200
    694 @@ -0,0 +1,380 @@
    695 +/*
    696 + +----------------------------------------------------------------------+
    697 + | Suhosin Patch for PHP |
    698 + +----------------------------------------------------------------------+
    699 + | Copyright (c) 2004-2006 Stefan Esser |
    700 + +----------------------------------------------------------------------+
    701 + | This source file is subject to version 2.02 of the PHP license, |
    702 + | that is bundled with this package in the file LICENSE, and is |
    703 + | available at through the world-wide-web at |
    704 + | http://www.php.net/license/2_02.txt. |
    705 + | If you did not receive a copy of the PHP license and are unable to |
    706 + | obtain it through the world-wide-web, please send a note to |
    707 + | license@php.net so we can mail you a copy immediately. |
    708 + +----------------------------------------------------------------------+
    709 + | Author: Stefan Esser <sesser@hardened-php.net> |
    710 + +----------------------------------------------------------------------+
    711 + */
    712 +/* $Id: php5-5.2.3-suhosin-0.9.6.2.patch,v 1.1 2007-07-11 00:34:20 niro Exp $ */
    713 +
    714 +#include "php.h"
    715 +
    716 +#include <stdio.h>
    717 +#include <stdlib.h>
    718 +
    719 +#if HAVE_UNISTD_H
    720 +#include <unistd.h>
    721 +#endif
    722 +#include "SAPI.h"
    723 +#include "php_globals.h"
    724 +
    725 +#if SUHOSIN_PATCH
    726 +
    727 +#ifdef HAVE_SYS_SOCKET_H
    728 +#include <sys/socket.h>
    729 +#endif
    730 +
    731 +#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE)
    732 +#undef AF_UNIX
    733 +#endif
    734 +
    735 +#if defined(AF_UNIX)
    736 +#include <sys/un.h>
    737 +#endif
    738 +
    739 +#define SYSLOG_PATH "/dev/log"
    740 +
    741 +#ifdef PHP_WIN32
    742 +static HANDLE log_source = 0;
    743 +#endif
    744 +
    745 +#include "snprintf.h"
    746 +
    747 +#include "suhosin_patch.h"
    748 +
    749 +#ifdef ZTS
    750 +#include "suhosin_globals.h"
    751 +int suhosin_patch_globals_id;
    752 +#else
    753 +struct _suhosin_patch_globals suhosin_patch_globals;
    754 +#endif
    755 +
    756 +static void php_security_log(int loglevel, char *fmt, ...);
    757 +
    758 +static void suhosin_patch_globals_ctor(suhosin_patch_globals_struct *suhosin_patch_globals TSRMLS_DC)
    759 +{
    760 + memset(suhosin_patch_globals, 0, sizeof(*suhosin_patch_globals));
    761 +}
    762 +
    763 +PHPAPI void suhosin_startup()
    764 +{
    765 +#ifdef ZTS
    766 + ts_allocate_id(&suhosin_patch_globals_id, sizeof(suhosin_patch_globals_struct), (ts_allocate_ctor) suhosin_patch_globals_ctor, NULL);
    767 +#else
    768 + suhosin_patch_globals_ctor(&suhosin_patch_globals TSRMLS_CC);
    769 +#endif
    770 + zend_suhosin_log = php_security_log;
    771 +}
    772 +
    773 +/*PHPAPI void suhosin_clear_mm_canaries(TSRMLS_D)
    774 +{
    775 + zend_alloc_clear_mm_canaries(AG(heap));
    776 + SPG(canary_1) = zend_canary();
    777 + SPG(canary_2) = zend_canary();
    778 + SPG(canary_3) = zend_canary();
    779 +}*/
    780 +
    781 +static char *loglevel2string(int loglevel)
    782 +{
    783 + switch (loglevel) {
    784 + case S_FILES:
    785 + return "FILES";
    786 + case S_INCLUDE:
    787 + return "INCLUDE";
    788 + case S_MEMORY:
    789 + return "MEMORY";
    790 + case S_MISC:
    791 + return "MISC";
    792 + case S_SESSION:
    793 + return "SESSION";
    794 + case S_SQL:
    795 + return "SQL";
    796 + case S_EXECUTOR:
    797 + return "EXECUTOR";
    798 + case S_VARS:
    799 + return "VARS";
    800 + default:
    801 + return "UNKNOWN";
    802 + }
    803 +}
    804 +
    805 +static void php_security_log(int loglevel, char *fmt, ...)
    806 +{
    807 + int s, r, i=0;
    808 +#if defined(AF_UNIX)
    809 + struct sockaddr_un saun;
    810 +#endif
    811 +#ifdef PHP_WIN32
    812 + LPTSTR strs[2];
    813 + unsigned short etype;
    814 + DWORD evid;
    815 +#endif
    816 + char buf[4096+64];
    817 + char error[4096+100];
    818 + char *ip_address;
    819 + char *fname;
    820 + char *alertstring;
    821 + int lineno;
    822 + va_list ap;
    823 + TSRMLS_FETCH();
    824 +
    825 + /*SDEBUG("(suhosin_log) loglevel: %d log_syslog: %u - log_sapi: %u - log_script: %u", loglevel, SPG(log_syslog), SPG(log_sapi), SPG(log_script));*/
    826 +
    827 + if (SPG(log_use_x_forwarded_for)) {
    828 + ip_address = sapi_getenv("HTTP_X_FORWARDED_FOR", 20 TSRMLS_CC);
    829 + if (ip_address == NULL) {
    830 + ip_address = "X-FORWARDED-FOR not set";
    831 + }
    832 + } else {
    833 + ip_address = sapi_getenv("REMOTE_ADDR", 11 TSRMLS_CC);
    834 + if (ip_address == NULL) {
    835 + ip_address = "REMOTE_ADDR not set";
    836 + }
    837 + }
    838 +
    839 +
    840 + va_start(ap, fmt);
    841 + ap_php_vsnprintf(error, sizeof(error), fmt, ap);
    842 + va_end(ap);
    843 + while (error[i]) {
    844 + if (error[i] < 32) error[i] = '.';
    845 + i++;
    846 + }
    847 +
    848 +/* if (SPG(simulation)) {
    849 + alertstring = "ALERT-SIMULATION";
    850 + } else { */
    851 + alertstring = "ALERT";
    852 +/* }*/
    853 +
    854 + if (zend_is_executing(TSRMLS_C)) {
    855 + if (EG(current_execute_data)) {
    856 + lineno = EG(current_execute_data)->opline->lineno;
    857 + fname = EG(current_execute_data)->op_array->filename;
    858 + } else {
    859 + lineno = zend_get_executed_lineno(TSRMLS_C);
    860 + fname = zend_get_executed_filename(TSRMLS_C);
    861 + }
    862 + ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s', line %u)", alertstring, error, ip_address, fname, lineno);
    863 + } else {
    864 + fname = sapi_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC);
    865 + if (fname==NULL) {
    866 + fname = "unknown";
    867 + }
    868 + ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s')", alertstring, error, ip_address, fname);
    869 + }
    870 +
    871 + /* Syslog-Logging disabled? */
    872 + if (((SPG(log_syslog)|S_INTERNAL) & loglevel)==0) {
    873 + goto log_sapi;
    874 + }
    875 +
    876 +#if defined(AF_UNIX)
    877 + ap_php_snprintf(error, sizeof(error), "<%u>suhosin[%u]: %s\n", (unsigned int)(SPG(log_syslog_facility)|SPG(log_syslog_priority)),getpid(),buf);
    878 +
    879 + s = socket(AF_UNIX, SOCK_DGRAM, 0);
    880 + if (s == -1) {
    881 + goto log_sapi;
    882 + }
    883 +
    884 + memset(&saun, 0, sizeof(saun));
    885 + saun.sun_family = AF_UNIX;
    886 + strcpy(saun.sun_path, SYSLOG_PATH);
    887 + /*saun.sun_len = sizeof(saun);*/
    888 +
    889 + r = connect(s, (struct sockaddr *)&saun, sizeof(saun));
    890 + if (r) {
    891 + close(s);
    892 + s = socket(AF_UNIX, SOCK_STREAM, 0);
    893 + if (s == -1) {
    894 + goto log_sapi;
    895 + }
    896 +
    897 + memset(&saun, 0, sizeof(saun));
    898 + saun.sun_family = AF_UNIX;
    899 + strcpy(saun.sun_path, SYSLOG_PATH);
    900 + /*saun.sun_len = sizeof(saun);*/
    901 +
    902 + r = connect(s, (struct sockaddr *)&saun, sizeof(saun));
    903 + if (r) {
    904 + close(s);
    905 + goto log_sapi;
    906 + }
    907 + }
    908 + send(s, error, strlen(error), 0);
    909 +
    910 + close(s);
    911 +#endif
    912 +#ifdef PHP_WIN32
    913 + ap_php_snprintf(error, sizeof(error), "suhosin[%u]: %s", getpid(),buf);
    914 +
    915 + switch (SPG(log_syslog_priority)) { /* translate UNIX type into NT type */
    916 + case 1: /*LOG_ALERT:*/
    917 + etype = EVENTLOG_ERROR_TYPE;
    918 + break;
    919 + case 6: /*LOG_INFO:*/
    920 + etype = EVENTLOG_INFORMATION_TYPE;
    921 + break;
    922 + default:
    923 + etype = EVENTLOG_WARNING_TYPE;
    924 + }
    925 + evid = loglevel;
    926 + strs[0] = error;
    927 + /* report the event */
    928 + if (log_source == NULL) {
    929 + log_source = RegisterEventSource(NULL, "Suhosin-Patch-" SUHOSIN_PATCH_VERSION);
    930 + }
    931 + ReportEvent(log_source, etype, (unsigned short) SPG(log_syslog_priority), evid, NULL, 1, 0, strs, NULL);
    932 +
    933 +#endif
    934 +log_sapi:
    935 + /* SAPI Logging activated? */
    936 + /*SDEBUG("(suhosin_log) log_syslog: %u - log_sapi: %u - log_script: %u - log_phpscript: %u", SPG(log_syslog), SPG(log_sapi), SPG(log_script), SPG(log_phpscript));*/
    937 + if (((SPG(log_sapi)|S_INTERNAL) & loglevel)!=0) {
    938 + sapi_module.log_message(buf);
    939 + }
    940 +
    941 +/*log_script:*/
    942 + /* script logging activaed? */
    943 + if (((SPG(log_script) & loglevel)!=0) && SPG(log_scriptname)!=NULL) {
    944 + char cmd[8192], *cmdpos, *bufpos;
    945 + FILE *in;
    946 + int space;
    947 +
    948 + ap_php_snprintf(cmd, sizeof(cmd), "%s %s \'", SPG(log_scriptname), loglevel2string(loglevel));
    949 + space = sizeof(cmd) - strlen(cmd);
    950 + cmdpos = cmd + strlen(cmd);
    951 + bufpos = buf;
    952 + if (space <= 1) return;
    953 + while (space > 2 && *bufpos) {
    954 + if (*bufpos == '\'') {
    955 + if (space<=5) break;
    956 + *cmdpos++ = '\'';
    957 + *cmdpos++ = '\\';
    958 + *cmdpos++ = '\'';
    959 + *cmdpos++ = '\'';
    960 + bufpos++;
    961 + space-=4;
    962 + } else {
    963 + *cmdpos++ = *bufpos++;
    964 + space--;
    965 + }
    966 + }
    967 + *cmdpos++ = '\'';
    968 + *cmdpos = 0;
    969 +
    970 + if ((in=VCWD_POPEN(cmd, "r"))==NULL) {
    971 + php_security_log(S_INTERNAL, "Unable to execute logging shell script: %s", SPG(log_scriptname));
    972 + return;
    973 + }
    974 + /* read and forget the result */
    975 + while (1) {
    976 + int readbytes = fread(cmd, 1, sizeof(cmd), in);
    977 + if (readbytes<=0) {
    978 + break;
    979 + }
    980 + }
    981 + pclose(in);
    982 + }
    983 +/*log_phpscript:*/
    984 + if ((SPG(log_phpscript) & loglevel)!=0 && EG(in_execution) && SPG(log_phpscriptname) && SPG(log_phpscriptname)[0]) {
    985 + zend_file_handle file_handle;
    986 + zend_op_array *new_op_array;
    987 + zval *result = NULL;
    988 +
    989 + /*long orig_execution_depth = SPG(execution_depth);*/
    990 + zend_bool orig_safe_mode = PG(safe_mode);
    991 + char *orig_basedir = PG(open_basedir);
    992 +
    993 + char *phpscript = SPG(log_phpscriptname);
    994 +/*SDEBUG("scriptname %s", SPG(log_phpscriptname));`*/
    995 +#ifdef ZEND_ENGINE_2
    996 + if (zend_stream_open(phpscript, &file_handle TSRMLS_CC) == SUCCESS) {
    997 +#else
    998 + if (zend_open(phpscript, &file_handle) == SUCCESS && ZEND_IS_VALID_FILE_HANDLE(&file_handle)) {
    999 + file_handle.filename = phpscript;
    1000 + file_handle.free_filename = 0;
    1001 +#endif
    1002 + if (!file_handle.opened_path) {
    1003 + file_handle.opened_path = estrndup(phpscript, strlen(phpscript));
    1004 + }
    1005 + new_op_array = zend_compile_file(&file_handle, ZEND_REQUIRE TSRMLS_CC);
    1006 + zend_destroy_file_handle(&file_handle TSRMLS_CC);
    1007 + if (new_op_array) {
    1008 + HashTable *active_symbol_table = EG(active_symbol_table);
    1009 + zval *zerror, *zerror_class;
    1010 +
    1011 + if (active_symbol_table == NULL) {
    1012 + active_symbol_table = &EG(symbol_table);
    1013 + }
    1014 + EG(return_value_ptr_ptr) = &result;
    1015 + EG(active_op_array) = new_op_array;
    1016 +
    1017 + MAKE_STD_ZVAL(zerror);
    1018 + MAKE_STD_ZVAL(zerror_class);
    1019 + ZVAL_STRING(zerror, buf, 1);
    1020 + ZVAL_LONG(zerror_class, loglevel);
    1021 +
    1022 + zend_hash_update(active_symbol_table, "SUHOSIN_ERROR", sizeof("SUHOSIN_ERROR"), (void **)&zerror, sizeof(zval *), NULL);
    1023 + zend_hash_update(active_symbol_table, "SUHOSIN_ERRORCLASS", sizeof("SUHOSIN_ERRORCLASS"), (void **)&zerror_class, sizeof(zval *), NULL);
    1024 +
    1025 + /*SPG(execution_depth) = 0;*/
    1026 + if (SPG(log_phpscript_is_safe)) {
    1027 + PG(safe_mode) = 0;
    1028 + PG(open_basedir) = NULL;
    1029 + }
    1030 +
    1031 + zend_execute(new_op_array TSRMLS_CC);
    1032 +
    1033 + /*SPG(execution_depth) = orig_execution_depth;*/
    1034 + PG(safe_mode) = orig_safe_mode;
    1035 + PG(open_basedir) = orig_basedir;
    1036 +
    1037 +#ifdef ZEND_ENGINE_2
    1038 + destroy_op_array(new_op_array TSRMLS_CC);
    1039 +#else
    1040 + destroy_op_array(new_op_array);
    1041 +#endif
    1042 + efree(new_op_array);
    1043 +#ifdef ZEND_ENGINE_2
    1044 + if (!EG(exception))
    1045 +#endif
    1046 + {
    1047 + if (EG(return_value_ptr_ptr)) {
    1048 + zval_ptr_dtor(EG(return_value_ptr_ptr));
    1049 + EG(return_value_ptr_ptr) = NULL;
    1050 + }
    1051 + }
    1052 + } else {
    1053 + php_security_log(S_INTERNAL, "Unable to execute logging PHP script: %s", SPG(log_phpscriptname));
    1054 + return;
    1055 + }
    1056 + } else {
    1057 + php_security_log(S_INTERNAL, "Unable to execute logging PHP script: %s", SPG(log_phpscriptname));
    1058 + return;
    1059 + }
    1060 + }
    1061 +
    1062 +}
    1063 +
    1064 +
    1065 +#endif
    1066 +
    1067 +/*
    1068 + * Local variables:
    1069 + * tab-width: 4
    1070 + * c-basic-offset: 4
    1071 + * End:
    1072 + * vim600: sw=4 ts=4 fdm=marker
    1073 + * vim<600: sw=4 ts=4
    1074 + */
    1075 diff -Nura php-5.2.3/main/suhosin_patch.h suhosin-patch-5.2.3-0.9.6.2/main/suhosin_patch.h
    1076 --- php-5.2.3/main/suhosin_patch.h 1970-01-01 01:00:00.000000000 +0100
    1077 +++ suhosin-patch-5.2.3-0.9.6.2/main/suhosin_patch.h 2007-06-01 11:03:54.000000000 +0200
    1078 @@ -0,0 +1,40 @@
    1079 +/*
    1080 + +----------------------------------------------------------------------+
    1081 + | Suhosin Patch for PHP |
    1082 + +----------------------------------------------------------------------+
    1083 + | Copyright (c) 2004-2006 Stefan Esser |
    1084 + +----------------------------------------------------------------------+
    1085 + | This source file is subject to version 2.02 of the PHP license, |
    1086 + | that is bundled with this package in the file LICENSE, and is |
    1087 + | available at through the world-wide-web at |
    1088 + | http://www.php.net/license/2_02.txt. |
    1089 + | If you did not receive a copy of the PHP license and are unable to |
    1090 + | obtain it through the world-wide-web, please send a note to |
    1091 + | license@php.net so we can mail you a copy immediately. |
    1092 + +----------------------------------------------------------------------+
    1093 + | Author: Stefan Esser <sesser@hardened-php.net> |
    1094 + +----------------------------------------------------------------------+
    1095 + */
    1096 +
    1097 +#ifndef SUHOSIN_PATCH_H
    1098 +#define SUHOSIN_PATCH_H
    1099 +
    1100 +#if SUHOSIN_PATCH
    1101 +
    1102 +#include "zend.h"
    1103 +
    1104 +PHPAPI void suhosin_startup();
    1105 +#define SUHOSIN_PATCH_VERSION "0.9.6.2"
    1106 +
    1107 +#define SUHOSIN_LOGO_GUID "SUHO8567F54-D428-14d2-A769-00DA302A5F18"
    1108 +
    1109 +#endif
    1110 +
    1111 +#endif /* SUHOSIN_PATCH_H */
    1112 +
    1113 +/*
    1114 + * Local variables:
    1115 + * tab-width: 4
    1116 + * c-basic-offset: 4
    1117 + * End:
    1118 + */
    1119 diff -Nura php-5.2.3/main/suhosin_patch.m4 suhosin-patch-5.2.3-0.9.6.2/main/suhosin_patch.m4
    1120 --- php-5.2.3/main/suhosin_patch.m4 1970-01-01 01:00:00.000000000 +0100
    1121 +++ suhosin-patch-5.2.3-0.9.6.2/main/suhosin_patch.m4 2007-06-01 11:03:54.000000000 +0200
    1122 @@ -0,0 +1,8 @@
    1123 +dnl
    1124 +dnl $Id: php5-5.2.3-suhosin-0.9.6.2.patch,v 1.1 2007-07-11 00:34:20 niro Exp $
    1125 +dnl
    1126 +dnl This file contains Suhosin Patch for PHP specific autoconf functions.
    1127 +dnl
    1128 +
    1129 +AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
    1130 +
    1131 diff -Nura php-5.2.3/sapi/apache/mod_php5.c suhosin-patch-5.2.3-0.9.6.2/sapi/apache/mod_php5.c
    1132 --- php-5.2.3/sapi/apache/mod_php5.c 2007-01-01 10:36:12.000000000 +0100
    1133 +++ suhosin-patch-5.2.3-0.9.6.2/sapi/apache/mod_php5.c 2007-06-01 11:03:54.000000000 +0200
    1134 @@ -943,7 +943,11 @@
    1135 {
    1136 TSRMLS_FETCH();
    1137 if (PG(expose_php)) {
    1138 +#if SUHOSIN_PATCH
    1139 + ap_add_version_component("PHP/" PHP_VERSION " with Suhosin-Patch");
    1140 +#else
    1141 ap_add_version_component("PHP/" PHP_VERSION);
    1142 +#endif
    1143 }
    1144 }
    1145 #endif
    1146 diff -Nura php-5.2.3/sapi/apache2filter/sapi_apache2.c suhosin-patch-5.2.3-0.9.6.2/sapi/apache2filter/sapi_apache2.c
    1147 --- php-5.2.3/sapi/apache2filter/sapi_apache2.c 2007-01-01 10:36:12.000000000 +0100
    1148 +++ suhosin-patch-5.2.3-0.9.6.2/sapi/apache2filter/sapi_apache2.c 2007-06-01 11:03:54.000000000 +0200
    1149 @@ -562,7 +562,11 @@
    1150 {
    1151 TSRMLS_FETCH();
    1152 if (PG(expose_php)) {
    1153 +#if SUHOSIN_PATCH
    1154 + ap_add_version_component(p, "PHP/" PHP_VERSION " with Suhosin-Patch");
    1155 +#else
    1156 ap_add_version_component(p, "PHP/" PHP_VERSION);
    1157 +#endif
    1158 }
    1159 }
    1160
    1161 diff -Nura php-5.2.3/sapi/apache2handler/sapi_apache2.c suhosin-patch-5.2.3-0.9.6.2/sapi/apache2handler/sapi_apache2.c
    1162 --- php-5.2.3/sapi/apache2handler/sapi_apache2.c 2007-01-01 10:36:12.000000000 +0100
    1163 +++ suhosin-patch-5.2.3-0.9.6.2/sapi/apache2handler/sapi_apache2.c 2007-06-01 11:03:54.000000000 +0200
    1164 @@ -364,7 +364,11 @@
    1165 {
    1166 TSRMLS_FETCH();
    1167 if (PG(expose_php)) {
    1168 +#if SUHOSIN_PATCH
    1169 + ap_add_version_component(p, "PHP/" PHP_VERSION " with Suhosin-Patch");
    1170 +#else
    1171 ap_add_version_component(p, "PHP/" PHP_VERSION);
    1172 +#endif
    1173 }
    1174 }
    1175
    1176 diff -Nura php-5.2.3/sapi/cgi/cgi_main.c suhosin-patch-5.2.3-0.9.6.2/sapi/cgi/cgi_main.c
    1177 --- php-5.2.3/sapi/cgi/cgi_main.c 2007-05-28 10:11:59.000000000 +0200
    1178 +++ suhosin-patch-5.2.3-0.9.6.2/sapi/cgi/cgi_main.c 2007-06-01 11:03:54.000000000 +0200
    1179 @@ -1560,11 +1560,19 @@
    1180 SG(headers_sent) = 1;
    1181 SG(request_info).no_headers = 1;
    1182 }
    1183 +#if SUHOSIN_PATCH
    1184 +#if ZEND_DEBUG
    1185 + php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2007 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
    1186 +#else
    1187 + php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s)\nCopyright (c) 1997-2007 The PHP Group\n%s", PHP_VERSION, SUHOSIN_PATCH_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
    1188 +#endif
    1189 +#else
    1190 #if ZEND_DEBUG
    1191 php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2007 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
    1192 #else
    1193 php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2007 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
    1194 #endif
    1195 +#endif
    1196 php_end_ob_buffers(1 TSRMLS_CC);
    1197 exit(0);
    1198 break;
    1199 diff -Nura php-5.2.3/sapi/cli/php_cli.c suhosin-patch-5.2.3-0.9.6.2/sapi/cli/php_cli.c
    1200 --- php-5.2.3/sapi/cli/php_cli.c 2007-05-06 14:57:50.000000000 +0200
    1201 +++ suhosin-patch-5.2.3-0.9.6.2/sapi/cli/php_cli.c 2007-06-01 11:03:54.000000000 +0200
    1202 @@ -777,8 +777,14 @@
    1203 }
    1204
    1205 request_started = 1;
    1206 - php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2007 The PHP Group\n%s",
    1207 - PHP_VERSION, sapi_module.name, __DATE__, __TIME__,
    1208 +#if SUHOSIN_PATCH
    1209 + php_printf("PHP %s with Suhosin-Patch %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2007 The PHP Group\n%s",
    1210 + PHP_VERSION, SUHOSIN_PATCH_VERSION,
    1211 +#else
    1212 + php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2007 The PHP Group\n%s",
    1213 + PHP_VERSION,
    1214 +#endif
    1215 + sapi_module.name, __DATE__, __TIME__,
    1216 #if ZEND_DEBUG && defined(HAVE_GCOV)
    1217 "(DEBUG GCOV)",
    1218 #elif ZEND_DEBUG
    1219 diff -Nura php-5.2.3/TSRM/TSRM.h suhosin-patch-5.2.3-0.9.6.2/TSRM/TSRM.h
    1220 --- php-5.2.3/TSRM/TSRM.h 2007-04-17 08:26:32.000000000 +0200
    1221 +++ suhosin-patch-5.2.3-0.9.6.2/TSRM/TSRM.h 2007-06-01 11:03:54.000000000 +0200
    1222 @@ -38,6 +38,13 @@
    1223 typedef unsigned long tsrm_uintptr_t;
    1224 #endif
    1225
    1226 +#if SUHOSIN_PATCH
    1227 +# if HAVE_REALPATH
    1228 +# undef realpath
    1229 +# define realpath php_realpath
    1230 +# endif
    1231 +#endif
    1232 +
    1233 /* Only compile multi-threading functions if we're in ZTS mode */
    1234 #ifdef ZTS
    1235
    1236 @@ -93,6 +100,7 @@
    1237
    1238 #define THREAD_HASH_OF(thr,ts) (unsigned long)thr%(unsigned long)ts
    1239
    1240 +
    1241 #ifdef __cplusplus
    1242 extern "C" {
    1243 #endif
    1244 diff -Nura php-5.2.3/TSRM/tsrm_virtual_cwd.c suhosin-patch-5.2.3-0.9.6.2/TSRM/tsrm_virtual_cwd.c
    1245 --- php-5.2.3/TSRM/tsrm_virtual_cwd.c 2007-05-30 12:50:47.000000000 +0200
    1246 +++ suhosin-patch-5.2.3-0.9.6.2/TSRM/tsrm_virtual_cwd.c 2007-06-01 11:03:54.000000000 +0200
    1247 @@ -267,6 +267,176 @@
    1248 return p;
    1249 }
    1250
    1251 +#if SUHOSIN_PATCH
    1252 +CWD_API char *php_realpath(const char *path, char *resolved)
    1253 +{
    1254 + struct stat sb;
    1255 + char *p, *q, *s;
    1256 + size_t left_len, resolved_len;
    1257 + unsigned symlinks;
    1258 + int serrno, slen;
    1259 + int is_dir = 1;
    1260 + char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX];
    1261 +
    1262 + serrno = errno;
    1263 + symlinks = 0;
    1264 + if (path[0] == '/') {
    1265 + resolved[0] = '/';
    1266 + resolved[1] = '\0';
    1267 + if (path[1] == '\0')
    1268 + return (resolved);
    1269 + resolved_len = 1;
    1270 + left_len = strlcpy(left, path + 1, sizeof(left));
    1271 + } else {
    1272 + if (getcwd(resolved, PATH_MAX) == NULL) {
    1273 + strlcpy(resolved, ".", PATH_MAX);
    1274 + return (NULL);
    1275 + }
    1276 + resolved_len = strlen(resolved);
    1277 + left_len = strlcpy(left, path, sizeof(left));
    1278 + }
    1279 + if (left_len >= sizeof(left) || resolved_len >= PATH_MAX) {
    1280 + errno = ENAMETOOLONG;
    1281 + return (NULL);
    1282 + }
    1283 +
    1284 + /*
    1285 + * Iterate over path components in `left'.
    1286 + */
    1287 + while (left_len != 0) {
    1288 + /*
    1289 + * Extract the next path component and adjust `left'
    1290 + * and its length.
    1291 + */
    1292 + p = strchr(left, '/');
    1293 + s = p ? p : left + left_len;
    1294 + if (s - left >= sizeof(next_token)) {
    1295 + errno = ENAMETOOLONG;
    1296 + return (NULL);
    1297 + }
    1298 + memcpy(next_token, left, s - left);
    1299 + next_token[s - left] = '\0';
    1300 + left_len -= s - left;
    1301 + if (p != NULL)
    1302 + memmove(left, s + 1, left_len + 1);
    1303 + if (resolved[resolved_len - 1] != '/') {
    1304 + if (resolved_len + 1 >= PATH_MAX) {
    1305 + errno = ENAMETOOLONG;
    1306 + return (NULL);
    1307 + }
    1308 + resolved[resolved_len++] = '/';
    1309 + resolved[resolved_len] = '\0';
    1310 + }
    1311 + if (next_token[0] == '\0')
    1312 + continue;
    1313 + else if (strcmp(next_token, ".") == 0)
    1314 + continue;
    1315 + else if (strcmp(next_token, "..") == 0) {
    1316 + /*
    1317 + * Strip the last path component except when we have
    1318 + * single "/"
    1319 + */
    1320 + if (!is_dir) {
    1321 + errno = ENOENT;
    1322 + return (NULL);
    1323 + }
    1324 + if (resolved_len > 1) {
    1325 + resolved[resolved_len - 1] = '\0';
    1326 + q = strrchr(resolved, '/');
    1327 + *q = '\0';
    1328 + resolved_len = q - resolved;
    1329 + }
    1330 + continue;
    1331 + }
    1332 +
    1333 + /*
    1334 + * Append the next path component and lstat() it. If
    1335 + * lstat() fails we still can return successfully if
    1336 + * there are no more path components left.
    1337 + */
    1338 + resolved_len = strlcat(resolved, next_token, PATH_MAX);
    1339 + if (resolved_len >= PATH_MAX) {
    1340 + errno = ENAMETOOLONG;
    1341 + return (NULL);
    1342 + }
    1343 + if (lstat(resolved, &sb) != 0) {
    1344 + if (errno == ENOENT) {
    1345 + if (p == NULL) {
    1346 + errno = serrno;
    1347 + return (resolved);
    1348 + } else if (strstr(left, "/.") == NULL && strstr(left, "./") == NULL) {
    1349 + resolved_len = strlcat(resolved, "/", PATH_MAX);
    1350 + resolved_len = strlcat(resolved, left, PATH_MAX);
    1351 + if (resolved_len >= PATH_MAX) {
    1352 + errno = ENAMETOOLONG;
    1353 + return (NULL);
    1354 + }
    1355 + errno = serrno;
    1356 + return (resolved);
    1357 + }
    1358 + }
    1359 + return (NULL);
    1360 + }
    1361 + if (S_ISLNK(sb.st_mode)) {
    1362 + if (symlinks++ > MAXSYMLINKS) {
    1363 + errno = ELOOP;
    1364 + return (NULL);
    1365 + }
    1366 + slen = readlink(resolved, symlink, sizeof(symlink) - 1);
    1367 + if (slen < 0)
    1368 + return (NULL);
    1369 + symlink[slen] = '\0';
    1370 + if (symlink[0] == '/') {
    1371 + resolved[1] = 0;
    1372 + resolved_len = 1;
    1373 + } else if (resolved_len > 1) {
    1374 + /* Strip the last path component. */
    1375 + resolved[resolved_len - 1] = '\0';
    1376 + q = strrchr(resolved, '/');
    1377 + *q = '\0';
    1378 + resolved_len = q - resolved;
    1379 + }
    1380 +
    1381 + /*
    1382 + * If there are any path components left, then
    1383 + * append them to symlink. The result is placed
    1384 + * in `left'.
    1385 + */
    1386 + if (p != NULL) {
    1387 + if (symlink[slen - 1] != '/') {
    1388 + if (slen + 1 >= sizeof(symlink)) {
    1389 + errno = ENAMETOOLONG;
    1390 + return (NULL);
    1391 + }
    1392 + symlink[slen] = '/';
    1393 + symlink[slen + 1] = 0;
    1394 + }
    1395 + left_len = strlcat(symlink, left, sizeof(left));
    1396 + if (left_len >= sizeof(left)) {
    1397 + errno = ENAMETOOLONG;
    1398 + return (NULL);
    1399 + }
    1400 + }
    1401 + left_len = strlcpy(left, symlink, sizeof(left));
    1402 + } else {
    1403 + if (S_ISDIR(sb.st_mode)) {
    1404 + is_dir = 1;
    1405 + } else {
    1406 + is_dir = 0;
    1407 + }
    1408 + }
    1409 + }
    1410 +
    1411 + /*
    1412 + * Remove trailing slash except when the resolved pathname
    1413 + * is a single "/".
    1414 + */
    1415 + if (resolved_len > 1 && resolved[resolved_len - 1] == '/')
    1416 + resolved[resolved_len - 1] = '\0';
    1417 + return (resolved);
    1418 +}
    1419 +#endif
    1420 +
    1421 CWD_API void virtual_cwd_startup(void)
    1422 {
    1423 char cwd[MAXPATHLEN];
    1424 diff -Nura php-5.2.3/TSRM/tsrm_virtual_cwd.h suhosin-patch-5.2.3-0.9.6.2/TSRM/tsrm_virtual_cwd.h
    1425 --- php-5.2.3/TSRM/tsrm_virtual_cwd.h 2007-01-22 10:31:46.000000000 +0100
    1426 +++ suhosin-patch-5.2.3-0.9.6.2/TSRM/tsrm_virtual_cwd.h 2007-06-01 11:03:54.000000000 +0200
    1427 @@ -139,6 +139,22 @@
    1428
    1429 typedef int (*verify_path_func)(const cwd_state *);
    1430
    1431 +#ifndef HAVE_STRLCPY
    1432 +CWD_API size_t php_strlcpy(char *dst, const char *src, size_t siz);
    1433 +#undef strlcpy
    1434 +#define strlcpy php_strlcpy
    1435 +#endif
    1436 +
    1437 +#ifndef HAVE_STRLCAT
    1438 +CWD_API size_t php_strlcat(char *dst, const char *src, size_t siz);
    1439 +#undef strlcat
    1440 +#define strlcat php_strlcat
    1441 +#endif
    1442 +
    1443 +
    1444 +#if SUHOSIN_PATCH
    1445 +CWD_API char *php_realpath(const char *path, char *resolved);
    1446 +#endif
    1447 CWD_API void virtual_cwd_startup(void);
    1448 CWD_API void virtual_cwd_shutdown(void);
    1449 CWD_API char *virtual_getcwd_ex(size_t *length TSRMLS_DC);
    1450 diff -Nura php-5.2.3/win32/build/config.w32 suhosin-patch-5.2.3-0.9.6.2/win32/build/config.w32
    1451 --- php-5.2.3/win32/build/config.w32 2007-04-18 11:38:59.000000000 +0200
    1452 +++ suhosin-patch-5.2.3-0.9.6.2/win32/build/config.w32 2007-06-01 11:03:54.000000000 +0200
    1453 @@ -299,7 +299,7 @@
    1454 zend_sprintf.c zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c \
    1455 zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
    1456 zend_object_handlers.c zend_objects_API.c \
    1457 - zend_default_classes.c zend_execute.c zend_strtod.c");
    1458 + zend_default_classes.c zend_execute.c zend_strtod.c zend_canary.c");
    1459
    1460 ADD_SOURCES("main", "main.c snprintf.c spprintf.c safe_mode.c fopen_wrappers.c \
    1461 php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
    1462 @@ -344,6 +344,8 @@
    1463 AC_DEFINE('HAVE_USLEEP', 1);
    1464 AC_DEFINE('HAVE_STRCOLL', 1);
    1465
    1466 +AC_DEFINE('SUHOSIN_PATCH', 1);
    1467 +
    1468 /* For snapshot builders, where can we find the additional
    1469 * files that make up the snapshot template? */
    1470 ARG_WITH("snapshot-template", "Path to snapshot builder template dir", "no");
    1471 diff -Nura php-5.2.3/Zend/Makefile.am suhosin-patch-5.2.3-0.9.6.2/Zend/Makefile.am
    1472 --- php-5.2.3/Zend/Makefile.am 2006-12-05 09:07:57.000000000 +0100
    1473 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/Makefile.am 2007-06-01 11:03:54.000000000 +0200
    1474 @@ -17,7 +17,7 @@
    1475 zend_objects_API.c zend_ts_hash.c zend_stream.c \
    1476 zend_default_classes.c \
    1477 zend_iterators.c zend_interfaces.c zend_exceptions.c \
    1478 - zend_strtod.c zend_multibyte.c
    1479 + zend_strtod.c zend_multibyte.c zend_canary.c
    1480
    1481 libZend_la_LDFLAGS =
    1482 libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
    1483 diff -Nura php-5.2.3/Zend/zend_alloc.c suhosin-patch-5.2.3-0.9.6.2/Zend/zend_alloc.c
    1484 --- php-5.2.3/Zend/zend_alloc.c 2007-05-28 12:07:50.000000000 +0200
    1485 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/zend_alloc.c 2007-06-01 11:03:54.000000000 +0200
    1486 @@ -311,13 +311,26 @@
    1487 #define MEM_BLOCK_GUARD 0x2A8FCC84
    1488 #define MEM_BLOCK_LEAK 0x6C5E8F2D
    1489
    1490 +#if SUHOSIN_PATCH
    1491 +# define CANARY_SIZE sizeof(size_t)
    1492 +#else
    1493 +# define CANARY_SIZE 0
    1494 +#endif
    1495 +
    1496 /* mm block type */
    1497 typedef struct _zend_mm_block_info {
    1498 #if ZEND_MM_COOKIES
    1499 size_t _cookie;
    1500 #endif
    1501 - size_t _size;
    1502 - size_t _prev;
    1503 +#if SUHOSIN_PATCH
    1504 + size_t canary_1;
    1505 +#endif
    1506 + size_t _size;
    1507 + size_t _prev;
    1508 +#if SUHOSIN_PATCH
    1509 + size_t size;
    1510 + size_t canary_2;
    1511 +#endif
    1512 } zend_mm_block_info;
    1513
    1514 #if ZEND_DEBUG
    1515 @@ -422,6 +435,9 @@
    1516 int miss;
    1517 } cache_stat[ZEND_MM_NUM_BUCKETS+1];
    1518 #endif
    1519 +#if SUHOSIN_PATCH
    1520 + size_t canary_1,canary_2,canary_3;
    1521 +#endif
    1522 };
    1523
    1524 #define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \
    1525 @@ -511,15 +527,15 @@
    1526 #define ZEND_MM_ALIGNED_SIZE(size) ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
    1527 #define ZEND_MM_ALIGNED_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block))
    1528 #define ZEND_MM_ALIGNED_FREE_HEADER_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block))
    1529 -#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE)
    1530 +#define ZEND_MM_MIN_ALLOC_BLOCK_SIZE ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE + CANARY_SIZE)
    1531 #define ZEND_MM_ALIGNED_MIN_HEADER_SIZE (ZEND_MM_MIN_ALLOC_BLOCK_SIZE>ZEND_MM_ALIGNED_FREE_HEADER_SIZE?ZEND_MM_MIN_ALLOC_BLOCK_SIZE:ZEND_MM_ALIGNED_FREE_HEADER_SIZE)
    1532 #define ZEND_MM_ALIGNED_SEGMENT_SIZE ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_segment))
    1533
    1534 -#define ZEND_MM_MIN_SIZE ((ZEND_MM_ALIGNED_MIN_HEADER_SIZE>(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE))?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE-(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE)):0)
    1535 +#define ZEND_MM_MIN_SIZE ((ZEND_MM_ALIGNED_MIN_HEADER_SIZE>(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE))?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE-(ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE)):0)
    1536
    1537 #define ZEND_MM_MAX_SMALL_SIZE ((ZEND_MM_NUM_BUCKETS<<ZEND_MM_ALIGNMENT_LOG2)+ZEND_MM_ALIGNED_MIN_HEADER_SIZE)
    1538
    1539 -#define ZEND_MM_TRUE_SIZE(size) ((size<ZEND_MM_MIN_SIZE)?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE):(ZEND_MM_ALIGNED_SIZE(size+ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE)))
    1540 +#define ZEND_MM_TRUE_SIZE(size) ((size<ZEND_MM_MIN_SIZE)?(ZEND_MM_ALIGNED_MIN_HEADER_SIZE):(ZEND_MM_ALIGNED_SIZE(size+ZEND_MM_ALIGNED_HEADER_SIZE+END_MAGIC_SIZE+CANARY_SIZE)))
    1541
    1542 #define ZEND_MM_BUCKET_INDEX(true_size) ((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2))
    1543
    1544 @@ -581,6 +597,48 @@
    1545
    1546 #endif
    1547
    1548 +#if SUHOSIN_PATCH
    1549 +
    1550 +# define SUHOSIN_MM_CHECK_CANARIES(block, MFUNCTION) do { \
    1551 + size_t *p = SUHOSIN_MM_END_CANARY_PTR(block), check; \
    1552 + if (((block)->info.canary_1 != heap->canary_1) || ((block)->info.canary_2 != heap->canary_2)) { \
    1553 + canary_mismatch: \
    1554 + zend_suhosin_log(S_MEMORY, "canary mismatch on " MFUNCTION " - heap overflow detected"); \
    1555 + exit(1); \
    1556 + } \
    1557 + memcpy(&check, p, CANARY_SIZE); \
    1558 + if (check != heap->canary_3) { \
    1559 + zend_suhosin_log(S_MEMORY, "canary mismatch on " MFUNCTION " - heap overflow detected"); \
    1560 + exit(1); \
    1561 + goto canary_mismatch; \
    1562 + } \
    1563 + } while (0)
    1564 +
    1565 +# define SUHOSIN_MM_SET_CANARIES(block) do { \
    1566 + (block)->info.canary_1 = heap->canary_1; \
    1567 + (block)->info.canary_2 = heap->canary_2; \
    1568 + } while (0)
    1569 +
    1570 +# define SUHOSIN_MM_END_CANARY_PTR(block) \
    1571 + (size_t*)(((char*)(ZEND_MM_DATA_OF(block))) + ((zend_mm_block*)(block))->info.size + END_MAGIC_SIZE)
    1572 +
    1573 +# define SUHOSIN_MM_SET_END_CANARY(block) do { \
    1574 + size_t *p = SUHOSIN_MM_END_CANARY_PTR(block); \
    1575 + memcpy(p, &heap->canary_3, CANARY_SIZE); \
    1576 + } while (0)
    1577 +
    1578 +#else
    1579 +
    1580 +# define SUHOSIN_MM_CHECK_CANARIES(block)
    1581 +
    1582 +# define SUHOSIN_MM_SET_CANARIES(block)
    1583 +
    1584 +# define SUHOSIN_MM_END_CANARY_PTR(block)
    1585 +
    1586 +# define SUHOSIN_MM_SET_END_CANARY(block)
    1587 +
    1588 +#endif
    1589 +
    1590
    1591 #if ZEND_MM_HEAP_PROTECTION
    1592
    1593 @@ -779,6 +837,12 @@
    1594 if (EXPECTED(prev == mm_block)) {
    1595 zend_mm_free_block **rp, **cp;
    1596
    1597 +#if SUHOSIN_PATCH
    1598 + if (next != mm_block) {
    1599 + zend_suhosin_log(S_MEMORY, "heap corrupt on efree() - heap corruption detected");
    1600 + exit(1);
    1601 + }
    1602 +#endif
    1603 #if ZEND_MM_SAFE_UNLINKING
    1604 if (UNEXPECTED(next != mm_block)) {
    1605 zend_mm_panic("zend_mm_heap corrupted");
    1606 @@ -817,6 +881,12 @@
    1607 }
    1608 } else {
    1609
    1610 +#if SUHOSIN_PATCH
    1611 + if (prev->next_free_block != mm_block || next->prev_free_block != mm_block) {
    1612 + zend_suhosin_log(S_MEMORY, "linked list corrupt on efree() - heap corruption detected");
    1613 + exit(1);
    1614 + }
    1615 +#endif
    1616 #if ZEND_MM_SAFE_UNLINKING
    1617 if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) {
    1618 zend_mm_panic("zend_mm_heap corrupted");
    1619 @@ -864,6 +934,11 @@
    1620 heap->large_free_buckets[i] = NULL;
    1621 }
    1622 heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap);
    1623 +#if SUHOSIN_PATCH
    1624 + heap->canary_1 = zend_canary();
    1625 + heap->canary_2 = zend_canary();
    1626 + heap->canary_3 = zend_canary();
    1627 +#endif
    1628 }
    1629
    1630 static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment)
    1631 @@ -1732,6 +1807,11 @@
    1632 best_fit = heap->cache[index];
    1633 heap->cache[index] = best_fit->prev_free_block;
    1634 heap->cached -= true_size;
    1635 +#if SUHOSIN_PATCH
    1636 + SUHOSIN_MM_SET_CANARIES(best_fit);
    1637 + ((zend_mm_block*)best_fit)->info.size = size;
    1638 + SUHOSIN_MM_SET_END_CANARY(best_fit);
    1639 +#endif
    1640 ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
    1641 ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
    1642 return ZEND_MM_DATA_OF(best_fit);
    1643 @@ -1866,6 +1946,12 @@
    1644
    1645 ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
    1646
    1647 +#if SUHOSIN_PATCH
    1648 + SUHOSIN_MM_SET_CANARIES(best_fit);
    1649 + ((zend_mm_block*)best_fit)->info.size = size;
    1650 + SUHOSIN_MM_SET_END_CANARY(best_fit);
    1651 +#endif
    1652 +
    1653 heap->size += true_size;
    1654 if (heap->peak < heap->size) {
    1655 heap->peak = heap->size;
    1656 @@ -1889,6 +1975,9 @@
    1657
    1658 mm_block = ZEND_MM_HEADER_OF(p);
    1659 size = ZEND_MM_BLOCK_SIZE(mm_block);
    1660 +#if SUHOSIN_PATCH
    1661 + SUHOSIN_MM_CHECK_CANARIES(mm_block, "efree()");
    1662 +#endif
    1663 ZEND_MM_CHECK_PROTECTION(mm_block);
    1664
    1665 #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
    1666 @@ -1951,6 +2040,9 @@
    1667 mm_block = ZEND_MM_HEADER_OF(p);
    1668 true_size = ZEND_MM_TRUE_SIZE(size);
    1669 orig_size = ZEND_MM_BLOCK_SIZE(mm_block);
    1670 +#if SUHOSIN_PATCH
    1671 + SUHOSIN_MM_CHECK_CANARIES(mm_block, "erealloc()");
    1672 +#endif
    1673 ZEND_MM_CHECK_PROTECTION(mm_block);
    1674
    1675 if (UNEXPECTED(true_size < size)) {
    1676 @@ -1982,6 +2074,11 @@
    1677 HANDLE_UNBLOCK_INTERRUPTIONS();
    1678 }
    1679 ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
    1680 +#if SUHOSIN_PATCH
    1681 + SUHOSIN_MM_SET_CANARIES(mm_block);
    1682 + ((zend_mm_block*)mm_block)->info.size = size;
    1683 + SUHOSIN_MM_SET_END_CANARY(mm_block);
    1684 +#endif
    1685 return p;
    1686 }
    1687
    1688 @@ -2001,13 +2098,18 @@
    1689 heap->cache[index] = best_fit->prev_free_block;
    1690 ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
    1691 ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
    1692 +#if SUHOSIN_PATCH
    1693 + SUHOSIN_MM_SET_CANARIES(best_fit);
    1694 + ((zend_mm_block*)best_fit)->info.size = size;
    1695 + SUHOSIN_MM_SET_END_CANARY(best_fit);
    1696 +#endif
    1697
    1698 ptr = ZEND_MM_DATA_OF(best_fit);
    1699
    1700 #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
    1701 memcpy(ptr, p, mm_block->debug.size);
    1702 #else
    1703 - memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE);
    1704 + memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE);
    1705 #endif
    1706
    1707 heap->cached -= true_size - orig_size;
    1708 @@ -2065,6 +2167,11 @@
    1709 if (heap->peak < heap->size) {
    1710 heap->peak = heap->size;
    1711 }
    1712 +#if SUHOSIN_PATCH
    1713 + SUHOSIN_MM_SET_CANARIES(mm_block);
    1714 + ((zend_mm_block*)mm_block)->info.size = size;
    1715 + SUHOSIN_MM_SET_END_CANARY(mm_block);
    1716 +#endif
    1717 HANDLE_UNBLOCK_INTERRUPTIONS();
    1718 return p;
    1719 } else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
    1720 @@ -2168,6 +2275,11 @@
    1721 }
    1722
    1723 HANDLE_UNBLOCK_INTERRUPTIONS();
    1724 +#if SUHOSIN_PATCH
    1725 + SUHOSIN_MM_SET_CANARIES(mm_block);
    1726 + ((zend_mm_block*)mm_block)->info.size = size;
    1727 + SUHOSIN_MM_SET_END_CANARY(mm_block);
    1728 +#endif
    1729 return ZEND_MM_DATA_OF(mm_block);
    1730 }
    1731
    1732 @@ -2175,7 +2287,7 @@
    1733 #if ZEND_DEBUG || ZEND_MM_HEAP_PROTECTION
    1734 memcpy(ptr, p, mm_block->debug.size);
    1735 #else
    1736 - memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE);
    1737 + memcpy(ptr, p, orig_size - ZEND_MM_ALIGNED_HEADER_SIZE - CANARY_SIZE);
    1738 #endif
    1739 _zend_mm_free_int(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
    1740 return ptr;
    1741 @@ -2418,6 +2530,17 @@
    1742 zend_mm_shutdown(AG(mm_heap), full_shutdown, silent);
    1743 }
    1744
    1745 +#if SUHOSIN_PATCH
    1746 +ZEND_API void suhosin_clear_mm_canaries(TSRMLS_D)
    1747 +{
    1748 +/* NOT HERE
    1749 +
    1750 + AG(mm_heap)->canary_1 = zend_canary();
    1751 + AG(mm_heap)->canary_2 = zend_canary();
    1752 + AG(mm_heap)->canary_3 = zend_canary(); */
    1753 +}
    1754 +#endif
    1755 +
    1756 static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
    1757 {
    1758 char *tmp;
    1759 diff -Nura php-5.2.3/Zend/zend_alloc.h suhosin-patch-5.2.3-0.9.6.2/Zend/zend_alloc.h
    1760 --- php-5.2.3/Zend/zend_alloc.h 2007-03-20 07:46:48.000000000 +0100
    1761 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/zend_alloc.h 2007-06-01 11:03:54.000000000 +0200
    1762 @@ -128,6 +128,9 @@
    1763
    1764 ZEND_API void start_memory_manager(TSRMLS_D);
    1765 ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC);
    1766 +#if SUHOSIN_PATCH
    1767 +ZEND_API void suhosin_clear_mm_canaries(TSRMLS_D);
    1768 +#endif
    1769 ZEND_API int is_zend_mm(TSRMLS_D);
    1770
    1771 #if ZEND_DEBUG
    1772 diff -Nura php-5.2.3/Zend/zend.c suhosin-patch-5.2.3-0.9.6.2/Zend/zend.c
    1773 --- php-5.2.3/Zend/zend.c 2007-04-26 21:08:58.000000000 +0200
    1774 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/zend.c 2007-06-01 11:03:54.000000000 +0200
    1775 @@ -57,7 +57,9 @@
    1776 ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
    1777 int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap);
    1778 ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
    1779 -
    1780 +#if SUHOSIN_PATCH
    1781 +ZEND_API void (*zend_suhosin_log)(int loglevel, char *fmt, ...);
    1782 +#endif
    1783 void (*zend_on_timeout)(int seconds TSRMLS_DC);
    1784
    1785 static void (*zend_message_dispatcher_p)(long message, void *data);
    1786 @@ -74,9 +76,88 @@
    1787 return SUCCESS;
    1788 }
    1789
    1790 +#if SUHOSIN_PATCH
    1791 +static ZEND_INI_MH(OnUpdateSuhosin_log_syslog)
    1792 +{
    1793 + if (!new_value) {
    1794 + SPG(log_syslog) = S_ALL & ~S_SQL | S_MEMORY;
    1795 + } else {
    1796 + SPG(log_syslog) = atoi(new_value) | S_MEMORY;
    1797 + }
    1798 + return SUCCESS;
    1799 +}
    1800 +static ZEND_INI_MH(OnUpdateSuhosin_log_syslog_facility)
    1801 +{
    1802 + if (!new_value) {
    1803 + SPG(log_syslog_facility) = LOG_USER;
    1804 + } else {
    1805 + SPG(log_syslog_facility) = atoi(new_value);
    1806 + }
    1807 + return SUCCESS;
    1808 +}
    1809 +static ZEND_INI_MH(OnUpdateSuhosin_log_syslog_priority)
    1810 +{
    1811 + if (!new_value) {
    1812 + SPG(log_syslog_priority) = LOG_ALERT;
    1813 + } else {
    1814 + SPG(log_syslog_priority) = atoi(new_value);
    1815 + }
    1816 + return SUCCESS;
    1817 +}
    1818 +static ZEND_INI_MH(OnUpdateSuhosin_log_sapi)
    1819 +{
    1820 + if (!new_value) {
    1821 + SPG(log_sapi) = S_ALL & ~S_SQL;
    1822 + } else {
    1823 + SPG(log_sapi) = atoi(new_value);
    1824 + }
    1825 + return SUCCESS;
    1826 +}
    1827 +static ZEND_INI_MH(OnUpdateSuhosin_log_script)
    1828 +{
    1829 + if (!new_value) {
    1830 + SPG(log_script) = S_ALL & ~S_MEMORY;
    1831 + } else {
    1832 + SPG(log_script) = atoi(new_value) & (~S_MEMORY) & (~S_INTERNAL);
    1833 + }
    1834 + return SUCCESS;
    1835 +}
    1836 +static ZEND_INI_MH(OnUpdateSuhosin_log_scriptname)
    1837 +{
    1838 + if (SPG(log_scriptname)) {
    1839 + pefree(SPG(log_scriptname),1);
    1840 + }
    1841 + SPG(log_scriptname) = NULL;
    1842 + if (new_value) {
    1843 + SPG(log_scriptname) = pestrdup(new_value,1);
    1844 + }
    1845 + return SUCCESS;
    1846 +}
    1847 +static ZEND_INI_MH(OnUpdateSuhosin_log_phpscript)
    1848 +{
    1849 + if (!new_value) {
    1850 + SPG(log_phpscript) = S_ALL & ~S_MEMORY;
    1851 + } else {
    1852 + SPG(log_phpscript) = atoi(new_value) & (~S_MEMORY) & (~S_INTERNAL);
    1853 + }
    1854 + return SUCCESS;
    1855 +}
    1856 +#endif
    1857
    1858 ZEND_INI_BEGIN()
    1859 ZEND_INI_ENTRY("error_reporting", NULL, ZEND_INI_ALL, OnUpdateErrorReporting)
    1860 +#if SUHOSIN_PATCH
    1861 + ZEND_INI_ENTRY("suhosin.log.syslog", NULL, ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateSuhosin_log_syslog)
    1862 + ZEND_INI_ENTRY("suhosin.log.syslog.facility", NULL, ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateSuhosin_log_syslog_facility)
    1863 + ZEND_INI_ENTRY("suhosin.log.syslog.priority", NULL, ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateSuhosin_log_syslog_priority)
    1864 + ZEND_INI_ENTRY("suhosin.log.sapi", NULL, ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateSuhosin_log_sapi)
    1865 + ZEND_INI_ENTRY("suhosin.log.script", NULL, ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateSuhosin_log_script)
    1866 + ZEND_INI_ENTRY("suhosin.log.script.name", NULL, ZEND_INI_SYSTEM, OnUpdateSuhosin_log_scriptname)
    1867 + STD_ZEND_INI_BOOLEAN("suhosin.log.use-x-forwarded-for", "0", ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateBool, log_use_x_forwarded_for, suhosin_patch_globals_struct, suhosin_patch_globals)
    1868 + ZEND_INI_ENTRY("suhosin.log.phpscript", "0", ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateSuhosin_log_phpscript)
    1869 + STD_ZEND_INI_ENTRY("suhosin.log.phpscript.name", NULL, ZEND_INI_PERDIR|ZEND_INI_SYSTEM, OnUpdateString, log_phpscriptname, suhosin_patch_globals_struct, suhosin_patch_globals)
    1870 + STD_ZEND_INI_BOOLEAN("suhosin.log.phpscript.is_safe", "0", ZEND_INI_SYSTEM, OnUpdateBool, log_phpscript_is_safe, suhosin_patch_globals_struct, suhosin_patch_globals)
    1871 +#endif
    1872 STD_ZEND_INI_BOOLEAN("zend.ze1_compatibility_mode", "0", ZEND_INI_ALL, OnUpdateBool, ze1_compatibility_mode, zend_executor_globals, executor_globals)
    1873 #ifdef ZEND_MULTIBYTE
    1874 STD_ZEND_INI_BOOLEAN("detect_unicode", "1", ZEND_INI_ALL, OnUpdateBool, detect_unicode, zend_compiler_globals, compiler_globals)
    1875 diff -Nura php-5.2.3/Zend/zend_canary.c suhosin-patch-5.2.3-0.9.6.2/Zend/zend_canary.c
    1876 --- php-5.2.3/Zend/zend_canary.c 1970-01-01 01:00:00.000000000 +0100
    1877 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/zend_canary.c 2007-06-01 11:03:54.000000000 +0200
    1878 @@ -0,0 +1,64 @@
    1879 +/*
    1880 + +----------------------------------------------------------------------+
    1881 + | Suhosin-Patch for PHP |
    1882 + +----------------------------------------------------------------------+
    1883 + | Copyright (c) 2004-2006 Stefan Esser |
    1884 + +----------------------------------------------------------------------+
    1885 + | This source file is subject to version 2.02 of the PHP license, |
    1886 + | that is bundled with this package in the file LICENSE, and is |
    1887 + | available at through the world-wide-web at |
    1888 + | http://www.php.net/license/2_02.txt. |
    1889 + | If you did not receive a copy of the PHP license and are unable to |
    1890 + | obtain it through the world-wide-web, please send a note to |
    1891 + | license@php.net so we can mail you a copy immediately. |
    1892 + +----------------------------------------------------------------------+
    1893 + | Author: Stefan Esser <sesser@hardened-php.net> |
    1894 + +----------------------------------------------------------------------+
    1895 + */
    1896 +/* $Id: php5-5.2.3-suhosin-0.9.6.2.patch,v 1.1 2007-07-11 00:34:20 niro Exp $ */
    1897 +
    1898 +#include "zend.h"
    1899 +
    1900 +#include <stdio.h>
    1901 +#include <stdlib.h>
    1902 +
    1903 +
    1904 +#if SUHOSIN_PATCH
    1905 +
    1906 +static size_t last_canary = 0x73625123;
    1907 +
    1908 +/* will be replaced later with more compatible method */
    1909 +ZEND_API size_t zend_canary()
    1910 +{
    1911 + time_t t;
    1912 + size_t canary;
    1913 + int fd;
    1914 +
    1915 +#ifndef PHP_WIN32
    1916 + fd = open("/dev/urandom", 0);
    1917 + if (fd != -1) {
    1918 + int r = read(fd, &canary, sizeof(canary));
    1919 + close(fd);
    1920 + if (r == sizeof(canary)) {
    1921 + return (canary);
    1922 + }
    1923 + }
    1924 +#endif
    1925 + /* not good but we never want to do this */
    1926 + time(&t);
    1927 + canary = *(unsigned int *)&t + getpid() << 16 + last_canary;
    1928 + last_canary ^= (canary << 5) | (canary >> (32-5));
    1929 + return (canary);
    1930 +}
    1931 +
    1932 +#endif
    1933 +
    1934 +
    1935 +/*
    1936 + * Local variables:
    1937 + * tab-width: 4
    1938 + * c-basic-offset: 4
    1939 + * End:
    1940 + * vim600: sw=4 ts=4 fdm=marker
    1941 + * vim<600: sw=4 ts=4
    1942 + */
    1943 diff -Nura php-5.2.3/Zend/zend_compile.c suhosin-patch-5.2.3-0.9.6.2/Zend/zend_compile.c
    1944 --- php-5.2.3/Zend/zend_compile.c 2007-05-18 15:12:03.000000000 +0200
    1945 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/zend_compile.c 2007-06-01 11:03:54.000000000 +0200
    1946 @@ -54,7 +54,6 @@
    1947 property_info->name = zend_strndup(property_info->name, property_info->name_length);
    1948 }
    1949
    1950 -
    1951 static void zend_destroy_property_info(zend_property_info *property_info)
    1952 {
    1953 efree(property_info->name);
    1954 @@ -68,6 +67,10 @@
    1955 {
    1956 free(property_info->name);
    1957 }
    1958 +#if SUHOSIN_PATCH
    1959 +void *suhosin_zend_destroy_property_info_internal = zend_destroy_property_info_internal;
    1960 +void *suhosin_zend_destroy_property_info = zend_destroy_property_info;
    1961 +#endif
    1962
    1963 static void build_runtime_defined_function_key(zval *result, char *name, int name_length TSRMLS_DC)
    1964 {
    1965 diff -Nura php-5.2.3/Zend/zend_compile.h suhosin-patch-5.2.3-0.9.6.2/Zend/zend_compile.h
    1966 --- php-5.2.3/Zend/zend_compile.h 2007-05-18 15:12:04.000000000 +0200
    1967 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/zend_compile.h 2007-06-01 11:03:54.000000000 +0200
    1968 @@ -564,6 +564,11 @@
    1969
    1970 int zendlex(znode *zendlval TSRMLS_DC);
    1971
    1972 +#if SUHOSIN_PATCH
    1973 +extern void *suhosin_zend_destroy_property_info_internal;
    1974 +extern void *suhosin_zend_destroy_property_info;
    1975 +#endif
    1976 +
    1977 /* BEGIN: OPCODES */
    1978
    1979 #include "zend_vm_opcodes.h"
    1980 @@ -686,6 +691,7 @@
    1981
    1982 #define ZEND_RETURNS_FUNCTION 1<<0
    1983
    1984 +
    1985 END_EXTERN_C()
    1986
    1987 #define ZEND_CLONE_FUNC_NAME "__clone"
    1988 diff -Nura php-5.2.3/Zend/zend_constants.c suhosin-patch-5.2.3-0.9.6.2/Zend/zend_constants.c
    1989 --- php-5.2.3/Zend/zend_constants.c 2007-04-04 02:42:42.000000000 +0200
    1990 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/zend_constants.c 2007-06-01 11:03:54.000000000 +0200
    1991 @@ -110,6 +110,75 @@
    1992 REGISTER_MAIN_LONG_CONSTANT("E_USER_NOTICE", E_USER_NOTICE, CONST_PERSISTENT | CONST_CS);
    1993
    1994 REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
    1995 +#if SUHOSIN_PATCH
    1996 + REGISTER_MAIN_LONG_CONSTANT("S_MEMORY", S_MEMORY, CONST_PERSISTENT | CONST_CS);
    1997 + REGISTER_MAIN_LONG_CONSTANT("S_VARS", S_VARS, CONST_PERSISTENT | CONST_CS);
    1998 + REGISTER_MAIN_LONG_CONSTANT("S_FILES", S_FILES, CONST_PERSISTENT | CONST_CS);
    1999 + REGISTER_MAIN_LONG_CONSTANT("S_INCLUDE", S_INCLUDE, CONST_PERSISTENT | CONST_CS);
    2000 + REGISTER_MAIN_LONG_CONSTANT("S_SQL", S_SQL, CONST_PERSISTENT | CONST_CS);
    2001 + REGISTER_MAIN_LONG_CONSTANT("S_EXECUTOR", S_EXECUTOR, CONST_PERSISTENT | CONST_CS);
    2002 + REGISTER_MAIN_LONG_CONSTANT("S_MAIL", S_MAIL, CONST_PERSISTENT | CONST_CS);
    2003 + REGISTER_MAIN_LONG_CONSTANT("S_SESSION", S_SESSION, CONST_PERSISTENT | CONST_CS);
    2004 + REGISTER_MAIN_LONG_CONSTANT("S_MISC", S_MISC, CONST_PERSISTENT | CONST_CS);
    2005 + REGISTER_MAIN_LONG_CONSTANT("S_INTERNAL", S_INTERNAL, CONST_PERSISTENT | CONST_CS);
    2006 + REGISTER_MAIN_LONG_CONSTANT("S_ALL", S_ALL, CONST_PERSISTENT | CONST_CS);
    2007 +
    2008 + /* error levels */
    2009 + REGISTER_MAIN_LONG_CONSTANT("LOG_EMERG", LOG_EMERG, CONST_CS | CONST_PERSISTENT); /* system unusable */
    2010 + REGISTER_MAIN_LONG_CONSTANT("LOG_ALERT", LOG_ALERT, CONST_CS | CONST_PERSISTENT); /* immediate action required */
    2011 + REGISTER_MAIN_LONG_CONSTANT("LOG_CRIT", LOG_CRIT, CONST_CS | CONST_PERSISTENT); /* critical conditions */
    2012 + REGISTER_MAIN_LONG_CONSTANT("LOG_ERR", LOG_ERR, CONST_CS | CONST_PERSISTENT);
    2013 + REGISTER_MAIN_LONG_CONSTANT("LOG_WARNING", LOG_WARNING, CONST_CS | CONST_PERSISTENT);
    2014 + REGISTER_MAIN_LONG_CONSTANT("LOG_NOTICE", LOG_NOTICE, CONST_CS | CONST_PERSISTENT);
    2015 + REGISTER_MAIN_LONG_CONSTANT("LOG_INFO", LOG_INFO, CONST_CS | CONST_PERSISTENT);
    2016 + REGISTER_MAIN_LONG_CONSTANT("LOG_DEBUG", LOG_DEBUG, CONST_CS | CONST_PERSISTENT);
    2017 + /* facility: type of program logging the message */
    2018 + REGISTER_MAIN_LONG_CONSTANT("LOG_KERN", LOG_KERN, CONST_CS | CONST_PERSISTENT);
    2019 + REGISTER_MAIN_LONG_CONSTANT("LOG_USER", LOG_USER, CONST_CS | CONST_PERSISTENT); /* generic user level */
    2020 + REGISTER_MAIN_LONG_CONSTANT("LOG_MAIL", LOG_MAIL, CONST_CS | CONST_PERSISTENT); /* log to email */
    2021 + REGISTER_MAIN_LONG_CONSTANT("LOG_DAEMON", LOG_DAEMON, CONST_CS | CONST_PERSISTENT); /* other system daemons */
    2022 + REGISTER_MAIN_LONG_CONSTANT("LOG_AUTH", LOG_AUTH, CONST_CS | CONST_PERSISTENT);
    2023 + REGISTER_MAIN_LONG_CONSTANT("LOG_SYSLOG", LOG_SYSLOG, CONST_CS | CONST_PERSISTENT);
    2024 + REGISTER_MAIN_LONG_CONSTANT("LOG_LPR", LOG_LPR, CONST_CS | CONST_PERSISTENT);
    2025 +#ifdef LOG_NEWS
    2026 + /* No LOG_NEWS on HP-UX */
    2027 + REGISTER_MAIN_LONG_CONSTANT("LOG_NEWS", LOG_NEWS, CONST_CS | CONST_PERSISTENT); /* usenet new */
    2028 +#endif
    2029 +#ifdef LOG_UUCP
    2030 + /* No LOG_UUCP on HP-UX */
    2031 + REGISTER_MAIN_LONG_CONSTANT("LOG_UUCP", LOG_UUCP, CONST_CS | CONST_PERSISTENT);
    2032 +#endif
    2033 +#ifdef LOG_CRON
    2034 + /* apparently some systems don't have this one */
    2035 + REGISTER_MAIN_LONG_CONSTANT("LOG_CRON", LOG_CRON, CONST_CS | CONST_PERSISTENT);
    2036 +#endif
    2037 +#ifdef LOG_AUTHPRIV
    2038 + /* AIX doesn't have LOG_AUTHPRIV */
    2039 + REGISTER_MAIN_LONG_CONSTANT("LOG_AUTHPRIV", LOG_AUTHPRIV, CONST_CS | CONST_PERSISTENT);
    2040 +#endif
    2041 +#if !defined(PHP_WIN32) && !defined(NETWARE)
    2042 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL0", LOG_LOCAL0, CONST_CS | CONST_PERSISTENT);
    2043 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL1", LOG_LOCAL1, CONST_CS | CONST_PERSISTENT);
    2044 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL2", LOG_LOCAL2, CONST_CS | CONST_PERSISTENT);
    2045 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL3", LOG_LOCAL3, CONST_CS | CONST_PERSISTENT);
    2046 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL4", LOG_LOCAL4, CONST_CS | CONST_PERSISTENT);
    2047 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL5", LOG_LOCAL5, CONST_CS | CONST_PERSISTENT);
    2048 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL6", LOG_LOCAL6, CONST_CS | CONST_PERSISTENT);
    2049 + REGISTER_MAIN_LONG_CONSTANT("LOG_LOCAL7", LOG_LOCAL7, CONST_CS | CONST_PERSISTENT);
    2050 +#endif
    2051 + /* options */
    2052 + REGISTER_MAIN_LONG_CONSTANT("LOG_PID", LOG_PID, CONST_CS | CONST_PERSISTENT);
    2053 + REGISTER_MAIN_LONG_CONSTANT("LOG_CONS", LOG_CONS, CONST_CS | CONST_PERSISTENT);
    2054 + REGISTER_MAIN_LONG_CONSTANT("LOG_ODELAY", LOG_ODELAY, CONST_CS | CONST_PERSISTENT);
    2055 + REGISTER_MAIN_LONG_CONSTANT("LOG_NDELAY", LOG_NDELAY, CONST_CS | CONST_PERSISTENT);
    2056 +#ifdef LOG_NOWAIT
    2057 + REGISTER_MAIN_LONG_CONSTANT("LOG_NOWAIT", LOG_NOWAIT, CONST_CS | CONST_PERSISTENT);
    2058 +#endif
    2059 +#ifdef LOG_PERROR
    2060 + /* AIX doesn't have LOG_PERROR */
    2061 + REGISTER_MAIN_LONG_CONSTANT("LOG_PERROR", LOG_PERROR, CONST_CS | CONST_PERSISTENT); /*log to stderr*/
    2062 +#endif
    2063 +#endif
    2064
    2065 /* true/false constants */
    2066 {
    2067 diff -Nura php-5.2.3/Zend/Zend.dsp suhosin-patch-5.2.3-0.9.6.2/Zend/Zend.dsp
    2068 --- php-5.2.3/Zend/Zend.dsp 2006-12-05 09:07:57.000000000 +0100
    2069 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/Zend.dsp 2007-06-01 11:03:54.000000000 +0200
    2070 @@ -239,6 +239,10 @@
    2071 # End Source File
    2072 # Begin Source File
    2073
    2074 +SOURCE=.\zend_canary.c
    2075 +# End Source File
    2076 +# Begin Source File
    2077 +
    2078 SOURCE=.\zend_ts_hash.c
    2079 # End Source File
    2080 # Begin Source File
    2081 diff -Nura php-5.2.3/Zend/zend_errors.h suhosin-patch-5.2.3-0.9.6.2/Zend/zend_errors.h
    2082 --- php-5.2.3/Zend/zend_errors.h 2007-01-01 10:35:46.000000000 +0100
    2083 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/zend_errors.h 2007-06-01 11:03:54.000000000 +0200
    2084 @@ -39,6 +39,20 @@
    2085 #define E_ALL (E_ERROR | E_WARNING | E_PARSE | E_NOTICE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_USER_ERROR | E_USER_WARNING | E_USER_NOTICE | E_RECOVERABLE_ERROR)
    2086 #define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
    2087
    2088 +#if SUHOSIN_PATCH
    2089 +#define S_MEMORY (1<<0L)
    2090 +#define S_MISC (1<<1L)
    2091 +#define S_VARS (1<<2L)
    2092 +#define S_FILES (1<<3L)
    2093 +#define S_INCLUDE (1<<4L)
    2094 +#define S_SQL (1<<5L)
    2095 +#define S_EXECUTOR (1<<6L)
    2096 +#define S_MAIL (1<<7L)
    2097 +#define S_SESSION (1<<8L)
    2098 +#define S_INTERNAL (1<<29L)
    2099 +#define S_ALL (S_MEMORY | S_VARS | S_INCLUDE | S_FILES | S_MAIL | S_SESSION | S_MISC | S_SQL | S_EXECUTOR)
    2100 +#endif
    2101 +
    2102 #endif /* ZEND_ERRORS_H */
    2103
    2104 /*
    2105 diff -Nura php-5.2.3/Zend/zend.h suhosin-patch-5.2.3-0.9.6.2/Zend/zend.h
    2106 --- php-5.2.3/Zend/zend.h 2007-04-26 21:08:58.000000000 +0200
    2107 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/zend.h 2007-06-01 11:03:54.000000000 +0200
    2108 @@ -520,6 +520,9 @@
    2109 extern ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC);
    2110 extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap);
    2111 extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
    2112 +#if SUHOSIN_PATCH
    2113 +extern ZEND_API void (*zend_suhosin_log)(int loglevel, char *fmt, ...);
    2114 +#endif
    2115
    2116
    2117 ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
    2118 @@ -650,6 +653,13 @@
    2119
    2120 #include "zend_variables.h"
    2121
    2122 +#if SUHOSIN_PATCH
    2123 +#include "suhosin_globals.h"
    2124 +#include "php_syslog.h"
    2125 +
    2126 +ZEND_API size_t zend_canary();
    2127 +#endif
    2128 +
    2129 #endif /* ZEND_H */
    2130
    2131 /*
    2132 diff -Nura php-5.2.3/Zend/zend_hash.c suhosin-patch-5.2.3-0.9.6.2/Zend/zend_hash.c
    2133 --- php-5.2.3/Zend/zend_hash.c 2007-02-21 15:11:00.000000000 +0100
    2134 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/zend_hash.c 2007-06-01 11:03:54.000000000 +0200
    2135 @@ -20,6 +20,7 @@
    2136 /* $Id: php5-5.2.3-suhosin-0.9.6.2.patch,v 1.1 2007-07-11 00:34:20 niro Exp $ */
    2137
    2138 #include "zend.h"
    2139 +#include "zend_compile.h"
    2140
    2141 #define CONNECT_TO_BUCKET_DLLIST(element, list_head) \
    2142 (element)->pNext = (list_head); \
    2143 @@ -132,7 +133,189 @@
    2144 (p)->pDataPtr=NULL; \
    2145 }
    2146
    2147 +#if SUHOSIN_PATCH
    2148 +#ifdef ZTS
    2149 +MUTEX_T zend_hash_dprot_mx_reader;
    2150 +MUTEX_T zend_hash_dprot_mx_writer;
    2151 +unsigned int zend_hash_dprot_reader;
    2152 +#endif
    2153 +unsigned int zend_hash_dprot_counter;
    2154 +unsigned int zend_hash_dprot_curmax;
    2155 +dtor_func_t *zend_hash_dprot_table = NULL;
    2156 +
    2157 +static void zend_hash_dprot_begin_read()
    2158 +{
    2159 +#ifdef ZTS
    2160 + tsrm_mutex_lock(zend_hash_dprot_mx_reader);
    2161 + if ((++(zend_hash_dprot_reader)) == 1) {
    2162 + tsrm_mutex_lock(zend_hash_dprot_mx_writer);
    2163 + }
    2164 + tsrm_mutex_unlock(zend_hash_dprot_mx_reader);
    2165 +#endif
    2166 +}
    2167 +
    2168 +static void zend_hash_dprot_end_read()
    2169 +{
    2170 +#ifdef ZTS
    2171 + tsrm_mutex_lock(zend_hash_dprot_mx_reader);
    2172 + if ((--(zend_hash_dprot_reader)) == 0) {
    2173 + tsrm_mutex_unlock(zend_hash_dprot_mx_writer);
    2174 + }
    2175 + tsrm_mutex_unlock(zend_hash_dprot_mx_reader);
    2176 +#endif
    2177 +}
    2178 +
    2179 +static void zend_hash_dprot_begin_write()
    2180 +{
    2181 +#ifdef ZTS
    2182 + tsrm_mutex_lock(zend_hash_dprot_mx_writer);
    2183 +#endif
    2184 +}
    2185 +
    2186 +static void zend_hash_dprot_end_write()
    2187 +{
    2188 +#ifdef ZTS
    2189 + tsrm_mutex_unlock(zend_hash_dprot_mx_writer);
    2190 +#endif
    2191 +}
    2192 +
    2193 +/*ZEND_API void zend_hash_dprot_dtor()
    2194 +{
    2195 +#ifdef ZTS
    2196 + tsrm_mutex_free(zend_hash_dprot_mx_reader);
    2197 + tsrm_mutex_free(zend_hash_dprot_mx_writer);
    2198 +#endif
    2199 + free(zend_hash_dprot_table);
    2200 +}*/
    2201 +
    2202 +static void zend_hash_add_destructor(dtor_func_t pDestructor)
    2203 +{
    2204 + int left, right, mid;
    2205 + zend_bool found = 0;
    2206 + unsigned long value;
    2207 +
    2208 + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR || pDestructor == ZVAL_INTERNAL_PTR_DTOR
    2209 + || pDestructor == ZEND_FUNCTION_DTOR || pDestructor == ZEND_CLASS_DTOR) {
    2210 + return;
    2211 + }
    2212 +
    2213 + if (zend_hash_dprot_table == NULL) {
    2214 +#ifdef ZTS
    2215 + zend_hash_dprot_mx_reader = tsrm_mutex_alloc();
    2216 + zend_hash_dprot_mx_writer = tsrm_mutex_alloc();
    2217 + zend_hash_dprot_reader = 0;
    2218 +#endif
    2219 + zend_hash_dprot_counter = 0;
    2220 + zend_hash_dprot_curmax = 256;
    2221 + zend_hash_dprot_table = (dtor_func_t *) malloc(256 * sizeof(dtor_func_t));
    2222 + }
    2223 +
    2224 + zend_hash_dprot_begin_write();
    2225 +
    2226 + if (zend_hash_dprot_counter == 0) {
    2227 + zend_hash_dprot_counter++;
    2228 + zend_hash_dprot_table[0] = pDestructor;
    2229 + } else {
    2230 + value = (unsigned long) pDestructor;
    2231 + left = 0;
    2232 + right = zend_hash_dprot_counter-1;
    2233 + mid = 0;
    2234 +
    2235 + while (left < right) {
    2236 + mid = (right - left) >> 1;
    2237 + mid += left;
    2238 + if ((unsigned long)zend_hash_dprot_table[mid] == value) {
    2239 + found = 1;
    2240 + break;
    2241 + }
    2242 + if (value < (unsigned long)zend_hash_dprot_table[mid]) {
    2243 + right = mid-1;
    2244 + } else {
    2245 + left = mid+1;
    2246 + }
    2247 + }
    2248 + if ((unsigned long)zend_hash_dprot_table[left] == value) {
    2249 + found = 1;
    2250 + }
    2251 +
    2252 + if (!found) {
    2253 +
    2254 + if (zend_hash_dprot_counter >= zend_hash_dprot_curmax) {
    2255 + zend_hash_dprot_curmax += 256;
    2256 + zend_hash_dprot_table = (dtor_func_t *) realloc(zend_hash_dprot_table, zend_hash_dprot_curmax * sizeof(dtor_func_t));
    2257 + }
    2258 +
    2259 + if ((unsigned long)zend_hash_dprot_table[left] < value) {
    2260 + memmove(zend_hash_dprot_table+left+2, zend_hash_dprot_table+left+1, (zend_hash_dprot_counter-left-1)*sizeof(dtor_func_t));
    2261 + zend_hash_dprot_table[left+1] = pDestructor;
    2262 + } else {
    2263 + memmove(zend_hash_dprot_table+left+1, zend_hash_dprot_table+left, (zend_hash_dprot_counter-left)*sizeof(dtor_func_t));
    2264 + zend_hash_dprot_table[left] = pDestructor;
    2265 + }
    2266 +
    2267 + zend_hash_dprot_counter++;
    2268 + }
    2269 + }
    2270 +
    2271 + zend_hash_dprot_end_write();
    2272 +}
    2273 +
    2274 +static void zend_hash_check_destructor(dtor_func_t pDestructor)
    2275 +{
    2276 + unsigned long value;
    2277 +
    2278 + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR || pDestructor == ZVAL_INTERNAL_PTR_DTOR
    2279 +#ifdef ZEND_ENGINE_2
    2280 + || pDestructor == suhosin_zend_destroy_property_info_internal || pDestructor == suhosin_zend_destroy_property_info
    2281 +#endif
    2282 + || pDestructor == ZEND_FUNCTION_DTOR || pDestructor == ZEND_CLASS_DTOR) {
    2283 + return;
    2284 + }
    2285 +
    2286 + zend_hash_dprot_begin_read();
    2287 +
    2288 + if (zend_hash_dprot_counter > 0) {
    2289 + int left, right, mid;
    2290 + zend_bool found = 0;
    2291 +
    2292 + value = (unsigned long) pDestructor;
    2293 + left = 0;
    2294 + right = zend_hash_dprot_counter-1;
    2295 +
    2296 + while (left < right) {
    2297 + mid = (right - left) >> 1;
    2298 + mid += left;
    2299 + if ((unsigned long)zend_hash_dprot_table[mid] == value) {
    2300 + found = 1;
    2301 + break;
    2302 + }
    2303 + if (value < (unsigned long)zend_hash_dprot_table[mid]) {
    2304 + right = mid-1;
    2305 + } else {
    2306 + left = mid+1;
    2307 + }
    2308 + }
    2309 + if ((unsigned long)zend_hash_dprot_table[left] == value) {
    2310 + found = 1;
    2311 + }
    2312 +
    2313 + if (!found) {
    2314 + zend_hash_dprot_end_read();
    2315 +
    2316 + zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown Hashtable destructor");
    2317 + exit(1);
    2318 + return;
    2319 + }
    2320 +
    2321 + }
    2322 +
    2323 + zend_hash_dprot_end_read();
    2324 +}
    2325
    2326 +#else
    2327 +#define zend_hash_add_destructor(pDestructor) do {} while(0)
    2328 +#define zend_hash_check_destructor(pDestructor) do {} while(0)
    2329 +#endif
    2330
    2331 ZEND_API int _zend_hash_init(HashTable *ht, uint nSize, hash_func_t pHashFunction, dtor_func_t pDestructor, zend_bool persistent ZEND_FILE_LINE_DC)
    2332 {
    2333 @@ -153,6 +336,7 @@
    2334
    2335 ht->nTableMask = ht->nTableSize - 1;
    2336 ht->pDestructor = pDestructor;
    2337 + zend_hash_add_destructor(pDestructor);
    2338 ht->arBuckets = NULL;
    2339 ht->pListHead = NULL;
    2340 ht->pListTail = NULL;
    2341 @@ -230,6 +414,8 @@
    2342 return FAILURE;
    2343 }
    2344 #endif
    2345 +
    2346 + zend_hash_check_destructor(ht->pDestructor);
    2347 if (ht->pDestructor) {
    2348 ht->pDestructor(p->pData);
    2349 }
    2350 @@ -295,6 +481,7 @@
    2351 return FAILURE;
    2352 }
    2353 #endif
    2354 + zend_hash_check_destructor(ht->pDestructor);
    2355 if (ht->pDestructor) {
    2356 ht->pDestructor(p->pData);
    2357 }
    2358 @@ -370,6 +557,7 @@
    2359 return FAILURE;
    2360 }
    2361 #endif
    2362 + zend_hash_check_destructor(ht->pDestructor);
    2363 if (ht->pDestructor) {
    2364 ht->pDestructor(p->pData);
    2365 }
    2366 @@ -493,6 +681,7 @@
    2367 if (ht->pInternalPointer == p) {
    2368 ht->pInternalPointer = p->pListNext;
    2369 }
    2370 + zend_hash_check_destructor(ht->pDestructor);
    2371 if (ht->pDestructor) {
    2372 ht->pDestructor(p->pData);
    2373 }
    2374 @@ -518,6 +707,8 @@
    2375
    2376 SET_INCONSISTENT(HT_IS_DESTROYING);
    2377
    2378 + zend_hash_check_destructor(ht->pDestructor);
    2379 +
    2380 p = ht->pListHead;
    2381 while (p != NULL) {
    2382 q = p;
    2383 @@ -544,6 +735,8 @@
    2384
    2385 SET_INCONSISTENT(HT_CLEANING);
    2386
    2387 + zend_hash_check_destructor(ht->pDestructor);
    2388 +
    2389 p = ht->pListHead;
    2390 while (p != NULL) {
    2391 q = p;
    2392 @@ -607,6 +800,7 @@
    2393 ht->nNumOfElements--;
    2394 HANDLE_UNBLOCK_INTERRUPTIONS();
    2395
    2396 + zend_hash_check_destructor(ht->pDestructor);
    2397 if (ht->pDestructor) {
    2398 ht->pDestructor(p->pData);
    2399 }
    2400 diff -Nura php-5.2.3/Zend/zend_llist.c suhosin-patch-5.2.3-0.9.6.2/Zend/zend_llist.c
    2401 --- php-5.2.3/Zend/zend_llist.c 2007-02-16 09:33:28.000000000 +0100
    2402 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/zend_llist.c 2007-06-01 11:03:54.000000000 +0200
    2403 @@ -23,6 +23,184 @@
    2404 #include "zend_llist.h"
    2405 #include "zend_qsort.h"
    2406
    2407 +#if SUHOSIN_PATCH
    2408 +#ifdef ZTS
    2409 +MUTEX_T zend_llist_dprot_mx_reader;
    2410 +MUTEX_T zend_llist_dprot_mx_writer;
    2411 +unsigned int zend_llist_dprot_reader;
    2412 +#endif
    2413 +unsigned int zend_llist_dprot_counter;
    2414 +unsigned int zend_llist_dprot_curmax;
    2415 +llist_dtor_func_t *zend_llist_dprot_table = NULL;
    2416 +
    2417 +static void zend_llist_dprot_begin_read()
    2418 +{
    2419 +#ifdef ZTS
    2420 + tsrm_mutex_lock(zend_llist_dprot_mx_reader);
    2421 + if ((++(zend_llist_dprot_reader)) == 1) {
    2422 + tsrm_mutex_lock(zend_llist_dprot_mx_writer);
    2423 + }
    2424 + tsrm_mutex_unlock(zend_llist_dprot_mx_reader);
    2425 +#endif
    2426 +}
    2427 +
    2428 +static void zend_llist_dprot_end_read()
    2429 +{
    2430 +#ifdef ZTS
    2431 + tsrm_mutex_lock(zend_llist_dprot_mx_reader);
    2432 + if ((--(zend_llist_dprot_reader)) == 0) {
    2433 + tsrm_mutex_unlock(zend_llist_dprot_mx_writer);
    2434 + }
    2435 + tsrm_mutex_unlock(zend_llist_dprot_mx_reader);
    2436 +#endif
    2437 +}
    2438 +
    2439 +static void zend_llist_dprot_begin_write()
    2440 +{
    2441 +#ifdef ZTS
    2442 + tsrm_mutex_lock(zend_llist_dprot_mx_writer);
    2443 +#endif
    2444 +}
    2445 +
    2446 +static void zend_llist_dprot_end_write()
    2447 +{
    2448 +#ifdef ZTS
    2449 + tsrm_mutex_unlock(zend_llist_dprot_mx_writer);
    2450 +#endif
    2451 +}
    2452 +
    2453 +/*ZEND_API void zend_llist_dprot_dtor()
    2454 +{
    2455 +#ifdef ZTS
    2456 + tsrm_mutex_free(zend_llist_dprot_mx_reader);
    2457 + tsrm_mutex_free(zend_llist_dprot_mx_writer);
    2458 +#endif
    2459 + free(zend_llist_dprot_table);
    2460 +}*/
    2461 +
    2462 +static void zend_llist_add_destructor(llist_dtor_func_t pDestructor)
    2463 +{
    2464 + int left, right, mid;
    2465 + zend_bool found = 0;
    2466 + unsigned long value;
    2467 +
    2468 + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR) {
    2469 + return;
    2470 + }
    2471 +
    2472 + if (zend_llist_dprot_table == NULL) {
    2473 +#ifdef ZTS
    2474 + zend_llist_dprot_mx_reader = tsrm_mutex_alloc();
    2475 + zend_llist_dprot_mx_writer = tsrm_mutex_alloc();
    2476 + zend_llist_dprot_reader = 0;
    2477 +#endif
    2478 + zend_llist_dprot_counter = 0;
    2479 + zend_llist_dprot_curmax = 256;
    2480 + zend_llist_dprot_table = (llist_dtor_func_t *) malloc(256 * sizeof(llist_dtor_func_t));
    2481 + }
    2482 +
    2483 + zend_llist_dprot_begin_write();
    2484 +
    2485 + if (zend_llist_dprot_counter == 0) {
    2486 + zend_llist_dprot_counter++;
    2487 + zend_llist_dprot_table[0] = pDestructor;
    2488 + } else {
    2489 + value = (unsigned long) pDestructor;
    2490 + left = 0;
    2491 + right = zend_llist_dprot_counter-1;
    2492 + mid = 0;
    2493 +
    2494 + while (left < right) {
    2495 + mid = (right - left) >> 1;
    2496 + mid += left;
    2497 + if ((unsigned long)zend_llist_dprot_table[mid] == value) {
    2498 + found = 1;
    2499 + break;
    2500 + }
    2501 + if (value < (unsigned long)zend_llist_dprot_table[mid]) {
    2502 + right = mid-1;
    2503 + } else {
    2504 + left = mid+1;
    2505 + }
    2506 + }
    2507 + if ((unsigned long)zend_llist_dprot_table[left] == value) {
    2508 + found = 1;
    2509 + }
    2510 +
    2511 + if (!found) {
    2512 +
    2513 + if (zend_llist_dprot_counter >= zend_llist_dprot_curmax) {
    2514 + zend_llist_dprot_curmax += 256;
    2515 + zend_llist_dprot_table = (llist_dtor_func_t *) realloc(zend_llist_dprot_table, zend_llist_dprot_curmax * sizeof(llist_dtor_func_t));
    2516 + }
    2517 +
    2518 + if ((unsigned long)zend_llist_dprot_table[left] < value) {
    2519 + memmove(zend_llist_dprot_table+left+2, zend_llist_dprot_table+left+1, (zend_llist_dprot_counter-left-1)*sizeof(llist_dtor_func_t));
    2520 + zend_llist_dprot_table[left+1] = pDestructor;
    2521 + } else {
    2522 + memmove(zend_llist_dprot_table+left+1, zend_llist_dprot_table+left, (zend_llist_dprot_counter-left)*sizeof(llist_dtor_func_t));
    2523 + zend_llist_dprot_table[left] = pDestructor;
    2524 + }
    2525 +
    2526 + zend_llist_dprot_counter++;
    2527 + }
    2528 + }
    2529 +
    2530 + zend_llist_dprot_end_write();
    2531 +}
    2532 +
    2533 +static void zend_llist_check_destructor(llist_dtor_func_t pDestructor)
    2534 +{
    2535 + unsigned long value;
    2536 +
    2537 + if (pDestructor == NULL || pDestructor == ZVAL_PTR_DTOR) {
    2538 + return;
    2539 + }
    2540 +
    2541 + zend_llist_dprot_begin_read();
    2542 +
    2543 + if (zend_llist_dprot_counter > 0) {
    2544 + int left, right, mid;
    2545 + zend_bool found = 0;
    2546 +
    2547 + value = (unsigned long) pDestructor;
    2548 + left = 0;
    2549 + right = zend_llist_dprot_counter-1;
    2550 +
    2551 + while (left < right) {
    2552 + mid = (right - left) >> 1;
    2553 + mid += left;
    2554 + if ((unsigned long)zend_llist_dprot_table[mid] == value) {
    2555 + found = 1;
    2556 + break;
    2557 + }
    2558 + if (value < (unsigned long)zend_llist_dprot_table[mid]) {
    2559 + right = mid-1;
    2560 + } else {
    2561 + left = mid+1;
    2562 + }
    2563 + }
    2564 + if ((unsigned long)zend_llist_dprot_table[left] == value) {
    2565 + found = 1;
    2566 + }
    2567 +
    2568 + if (!found) {
    2569 + zend_llist_dprot_end_read();
    2570 +
    2571 + zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown llist destructor");
    2572 + exit(1);
    2573 + return;
    2574 + }
    2575 +
    2576 + }
    2577 +
    2578 + zend_llist_dprot_end_read();
    2579 +}
    2580 +#else
    2581 +#define zend_llist_add_destructor(pDestructor) do {} while(0)
    2582 +#define zend_llist_check_destructor(pDestructor) do {} while(0)
    2583 +#endif
    2584 +
    2585 ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent)
    2586 {
    2587 l->head = NULL;
    2588 @@ -30,6 +208,7 @@
    2589 l->count = 0;
    2590 l->size = size;
    2591 l->dtor = dtor;
    2592 + zend_llist_add_destructor(dtor);
    2593 l->persistent = persistent;
    2594 }
    2595
    2596 @@ -81,6 +260,7 @@
    2597 } else {\
    2598 (l)->tail = (current)->prev;\
    2599 }\
    2600 + zend_llist_check_destructor((l)->dtor); \
    2601 if ((l)->dtor) {\
    2602 (l)->dtor((current)->data);\
    2603 }\
    2604 @@ -108,6 +288,7 @@
    2605 {
    2606 zend_llist_element *current=l->head, *next;
    2607
    2608 + zend_llist_check_destructor(l->dtor);
    2609 while (current) {
    2610 next = current->next;
    2611 if (l->dtor) {
    2612 @@ -133,6 +314,7 @@
    2613 zend_llist_element *old_tail;
    2614 void *data;
    2615
    2616 + zend_llist_check_destructor(l->dtor);
    2617 if ((old_tail = l->tail)) {
    2618 if (old_tail->prev) {
    2619 old_tail->prev->next = NULL;
    2620 diff -Nura php-5.2.3/Zend/ZendTS.dsp suhosin-patch-5.2.3-0.9.6.2/Zend/ZendTS.dsp
    2621 --- php-5.2.3/Zend/ZendTS.dsp 2006-12-05 09:07:57.000000000 +0100
    2622 +++ suhosin-patch-5.2.3-0.9.6.2/Zend/ZendTS.dsp 2007-06-01 11:03:54.000000000 +0200
    2623 @@ -273,6 +273,10 @@
    2624 # End Source File
    2625 # Begin Source File
    2626
    2627 +SOURCE=.\zend_canary.c
    2628 +# End Source File
    2629 +# Begin Source File
    2630 +
    2631 SOURCE=.\zend_ts_hash.c
    2632 # End Source File
    2633 # Begin Source File