-diff -Nura php-5.3.1RC1/Zend/Makefile.am suhosin-patch-5.3.1RC1-0.9.8/Zend/Makefile.am
---- php-5.3.1RC1/Zend/Makefile.am 2009-03-18 11:18:10.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/Makefile.am 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/Zend/Makefile.am suhosin-patch-5.3.9-0.9.10/Zend/Makefile.am
+--- php-5.3.9/Zend/Makefile.am 2009-03-18 11:18:10.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/Makefile.am 2012-01-11 19:29:07.000000000 +0100
@@ -17,7 +17,7 @@
zend_objects_API.c zend_ts_hash.c zend_stream.c \
zend_default_classes.c \
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
-diff -Nura php-5.3.1RC1/Zend/Zend.dsp suhosin-patch-5.3.1RC1-0.9.8/Zend/Zend.dsp
---- php-5.3.1RC1/Zend/Zend.dsp 2009-03-18 11:18:10.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/Zend.dsp 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/Zend/Zend.dsp suhosin-patch-5.3.9-0.9.10/Zend/Zend.dsp
+--- php-5.3.9/Zend/Zend.dsp 2009-03-18 11:18:10.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/Zend.dsp 2012-01-11 19:29:07.000000000 +0100
@@ -247,6 +247,14 @@
- # End Source File
- # Begin Source File
-
-+SOURCE=.\zend_canary.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=.\zend_alloc_canary.c
-+# End Source File
-+# Begin Source File
-+
- SOURCE=.\zend_ts_hash.c
- # End Source File
- # Begin Source File
-diff -Nura php-5.3.1RC1/Zend/ZendTS.dsp suhosin-patch-5.3.1RC1-0.9.8/Zend/ZendTS.dsp
---- php-5.3.1RC1/Zend/ZendTS.dsp 2008-07-14 11:49:03.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/ZendTS.dsp 2009-09-27 19:04:06.000000000 +0200
+ # End Source File\r
+ # Begin Source File\r
+ \r
++SOURCE=.\zend_canary.c\r
++# End Source File\r
++# Begin Source File\r
++\r
++SOURCE=.\zend_alloc_canary.c\r
++# End Source File\r
++# Begin Source File\r
++\r
+ SOURCE=.\zend_ts_hash.c\r
+ # End Source File\r
+ # Begin Source File\r
+diff -Nura php-5.3.9/Zend/ZendTS.dsp suhosin-patch-5.3.9-0.9.10/Zend/ZendTS.dsp
+--- php-5.3.9/Zend/ZendTS.dsp 2008-07-14 11:49:03.000000000 +0200
++++ suhosin-patch-5.3.9-0.9.10/Zend/ZendTS.dsp 2012-01-11 19:29:07.000000000 +0100
@@ -277,6 +277,14 @@
- # End Source File
- # Begin Source File
-
-+SOURCE=.\zend_canary.c
-+# End Source File
-+# Begin Source File
-+
-+SOURCE=.\zend_alloc_canary.c
-+# End Source File
-+# Begin Source File
-+
- SOURCE=.\zend_ts_hash.c
- # End Source File
- # Begin Source File
-diff -Nura php-5.3.1RC1/Zend/zend.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend.c
---- php-5.3.1RC1/Zend/zend.c 2009-06-16 18:10:15.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend.c 2009-09-27 19:04:06.000000000 +0200
+ # End Source File\r
+ # Begin Source File\r
+ \r
++SOURCE=.\zend_canary.c\r
++# End Source File\r
++# Begin Source File\r
++\r
++SOURCE=.\zend_alloc_canary.c\r
++# End Source File\r
++# Begin Source File\r
++\r
+ SOURCE=.\zend_ts_hash.c\r
+ # End Source File\r
+ # Begin Source File\r
+diff -Nura php-5.3.9/Zend/zend.c suhosin-patch-5.3.9-0.9.10/Zend/zend.c
+--- php-5.3.9/Zend/zend.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend.c 2012-01-11 19:29:07.000000000 +0100
@@ -60,6 +60,10 @@
ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len TSRMLS_DC);
ZEND_INI_BEGIN()
ZEND_INI_ENTRY("error_reporting", NULL, ZEND_INI_ALL, OnUpdateErrorReporting)
STD_ZEND_INI_BOOLEAN("zend.enable_gc", "1", ZEND_INI_ALL, OnUpdateGCEnabled, gc_enabled, zend_gc_globals, gc_globals)
-diff -Nura php-5.3.1RC1/Zend/zend.h suhosin-patch-5.3.1RC1-0.9.8/Zend/zend.h
---- php-5.3.1RC1/Zend/zend.h 2009-08-06 03:33:54.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend.h 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/Zend/zend.h suhosin-patch-5.3.9-0.9.10/Zend/zend.h
+--- php-5.3.9/Zend/zend.h 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend.h 2012-01-11 19:29:07.000000000 +0100
@@ -627,6 +627,9 @@
extern int (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap);
extern ZEND_API char *(*zend_getenv)(char *name, size_t name_len TSRMLS_DC);
ZEND_API void zend_error(int type, const char *format, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3);
-@@ -766,6 +769,14 @@
- ZEND_API void zend_replace_error_handling(zend_error_handling_t error_handling, zend_class_entry *exception_class, zend_error_handling *current TSRMLS_DC);
- ZEND_API void zend_restore_error_handling(zend_error_handling *saved TSRMLS_DC);
+@@ -774,6 +777,16 @@
+ #define DEBUG_BACKTRACE_PROVIDE_OBJECT (1<<0)
+ #define DEBUG_BACKTRACE_IGNORE_ARGS (1<<1)
+#if SUHOSIN_PATCH
+#include "suhosin_globals.h"
+#include "suhosin_patch.h"
+#include "php_syslog.h"
+
-+ZEND_API size_t zend_canary();
++ZEND_API void zend_canary(void *buf, int len);
++ZEND_API char suhosin_get_config(int element);
++
+#endif
+
#endif /* ZEND_H */
/*
-diff -Nura php-5.3.1RC1/Zend/zend_alloc.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc.c
---- php-5.3.1RC1/Zend/zend_alloc.c 2009-09-03 16:33:11.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc.c 2009-09-27 19:08:35.000000000 +0200
-@@ -18,7 +18,7 @@
- +----------------------------------------------------------------------+
- */
-
--/* $Id$ */
-+/* $Id$ */
-
- #include "zend.h"
- #include "zend_alloc.h"
+diff -Nura php-5.3.9/Zend/zend_alloc.c suhosin-patch-5.3.9-0.9.10/Zend/zend_alloc.c
+--- php-5.3.9/Zend/zend_alloc.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_alloc.c 2012-01-11 19:29:07.000000000 +0100
@@ -32,6 +32,10 @@
# include <unistd.h>
#endif
#if (defined (__GNUC__) && __GNUC__ > 2 ) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(__hpux) && !defined(_AIX)
static void zend_mm_panic(const char *message) __attribute__ ((noreturn));
-@@ -324,13 +330,28 @@
+@@ -134,6 +140,8 @@
+ # endif
+ #endif
+
++static zend_intptr_t SUHOSIN_POINTER_GUARD = 0;
++
+ static zend_mm_storage* zend_mm_mem_dummy_init(void *params)
+ {
+ return malloc(sizeof(zend_mm_storage));
+@@ -332,13 +340,28 @@
#define MEM_BLOCK_GUARD 0x2A8FCC84
#define MEM_BLOCK_LEAK 0x6C5E8F2D
} zend_mm_block_info;
#if ZEND_DEBUG
-@@ -404,7 +425,7 @@
+@@ -412,7 +435,7 @@
# define ZEND_MM_CACHE_STAT 0
#endif
int use_zend_alloc;
void *(*_malloc)(size_t);
void (*_free)(void*);
-@@ -439,6 +460,9 @@
+@@ -447,6 +470,9 @@
int miss;
} cache_stat[ZEND_MM_NUM_BUCKETS+1];
#endif
};
#define ZEND_MM_SMALL_FREE_BUCKET(heap, index) \
-@@ -512,18 +536,31 @@
+@@ -520,18 +546,31 @@
/* optimized access */
#define ZEND_MM_FREE_BLOCK_SIZE(b) (b)->info._size
#define ZEND_MM_BUCKET_INDEX(true_size) ((true_size>>ZEND_MM_ALIGNMENT_LOG2)-(ZEND_MM_ALIGNED_MIN_HEADER_SIZE>>ZEND_MM_ALIGNMENT_LOG2))
-@@ -585,6 +622,44 @@
+@@ -593,6 +632,44 @@
#endif
#if ZEND_MM_HEAP_PROTECTION
-@@ -707,7 +782,7 @@
+@@ -715,7 +792,7 @@
#endif
}
{
zend_mm_free_block *prev, *next;
-@@ -724,7 +799,7 @@
- prev->next_free_block = next->prev_free_block = mm_block;
+@@ -725,14 +802,14 @@
+ mm_block->parent = NULL;
+ }
+
+- prev = heap->rest_buckets[0];
+- next = prev->next_free_block;
+- mm_block->prev_free_block = prev;
+- mm_block->next_free_block = next;
+- prev->next_free_block = next->prev_free_block = mm_block;
++ prev = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]);
++ next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
}
-static inline void zend_mm_add_to_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block)
{
size_t size;
size_t index;
-@@ -785,7 +860,7 @@
+@@ -749,7 +826,7 @@
+ if (!*p) {
+ *p = mm_block;
+ mm_block->parent = p;
+- mm_block->prev_free_block = mm_block->next_free_block = mm_block;
++ mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block);
+ heap->large_free_bitmap |= (ZEND_MM_LONG_CONST(1) << index);
+ } else {
+ size_t m;
+@@ -762,15 +839,15 @@
+ if (!*p) {
+ *p = mm_block;
+ mm_block->parent = p;
+- mm_block->prev_free_block = mm_block->next_free_block = mm_block;
++ mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block);
+ break;
+ }
+ } else {
+- zend_mm_free_block *next = prev->next_free_block;
++ zend_mm_free_block *next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
+
+- prev->next_free_block = next->prev_free_block = mm_block;
+- mm_block->next_free_block = next;
+- mm_block->prev_free_block = prev;
++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
+ mm_block->parent = NULL;
+ break;
+ }
+@@ -782,27 +859,33 @@
+ index = ZEND_MM_BUCKET_INDEX(size);
+
+ prev = ZEND_MM_SMALL_FREE_BUCKET(heap, index);
+- if (prev->prev_free_block == prev) {
++ if (SUHOSIN_MANGLE_PTR(prev->prev_free_block) == prev) {
+ heap->free_bitmap |= (ZEND_MM_LONG_CONST(1) << index);
+ }
+- next = prev->next_free_block;
++ next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
+
+- mm_block->prev_free_block = prev;
+- mm_block->next_free_block = next;
+- prev->next_free_block = next->prev_free_block = mm_block;
++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
}
}
-static inline void zend_mm_remove_from_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block)
+static void zend_mm_remove_from_free_list(zend_mm_heap *heap, zend_mm_free_block *mm_block)
{
- zend_mm_free_block *prev = mm_block->prev_free_block;
- zend_mm_free_block *next = mm_block->next_free_block;
-@@ -795,6 +870,12 @@
+- zend_mm_free_block *prev = mm_block->prev_free_block;
+- zend_mm_free_block *next = mm_block->next_free_block;
++ zend_mm_free_block *prev = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block);
++ zend_mm_free_block *next = SUHOSIN_MANGLE_PTR(mm_block->next_free_block);
+
+ ZEND_MM_CHECK_MAGIC(mm_block, MEM_BLOCK_FREED);
+
if (EXPECTED(prev == mm_block)) {
zend_mm_free_block **rp, **cp;
#if ZEND_MM_SAFE_UNLINKING
if (UNEXPECTED(next != mm_block)) {
zend_mm_panic("zend_mm_heap corrupted");
-@@ -833,6 +914,13 @@
+@@ -841,14 +924,21 @@
}
} else {
+#if SUHOSIN_PATCH
-+ if (prev->next_free_block != mm_block || next->prev_free_block != mm_block) {
++ if (SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block || SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block) {
+ zend_suhosin_log(S_MEMORY, "zend_mm_head corrupted at %p", mm_block);
+ _exit(1);
+ }
+#endif
+
#if ZEND_MM_SAFE_UNLINKING
- if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) {
+- if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) {
++ if (UNEXPECTED(SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block) || UNEXPECTED(SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block)) {
zend_mm_panic("zend_mm_heap corrupted");
-@@ -856,7 +944,7 @@
+ }
+ #endif
+
+- prev->next_free_block = next;
+- next->prev_free_block = prev;
++ prev->next_free_block = SUHOSIN_MANGLE_PTR(next);
++ next->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
+
+ if (EXPECTED(ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block)))) {
+ if (EXPECTED(prev == next)) {
+@@ -864,7 +954,7 @@
}
}
{
zend_mm_free_block* p;
int i;
-@@ -880,6 +968,13 @@
+@@ -882,12 +972,19 @@
+ #endif
+ p = ZEND_MM_SMALL_FREE_BUCKET(heap, 0);
+ for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
+- p->next_free_block = p;
+- p->prev_free_block = p;
++ p->next_free_block = SUHOSIN_MANGLE_PTR(p);
++ p->prev_free_block = SUHOSIN_MANGLE_PTR(p);
+ p = (zend_mm_free_block*)((char*)p + sizeof(zend_mm_free_block*) * 2);
heap->large_free_buckets[i] = NULL;
}
- heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap);
+- heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap);
++ heap->rest_buckets[0] = heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(heap));
+#if SUHOSIN_PATCH
+ if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) {
-+ heap->canary_1 = zend_canary();
-+ heap->canary_2 = zend_canary();
-+ heap->canary_3 = zend_canary();
++ zend_canary(&heap->canary_1, sizeof(heap->canary_1));
++ zend_canary(&heap->canary_2, sizeof(heap->canary_2));
++ zend_canary(&heap->canary_3, sizeof(heap->canary_3));
+ }
+#endif
}
static void zend_mm_del_segment(zend_mm_heap *heap, zend_mm_segment *segment)
-@@ -988,11 +1083,16 @@
- }
+@@ -908,12 +1005,13 @@
+ int i;
+
+ for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
++ /* NULL means NULL even MANGLED */
+ if (heap->cache[i]) {
+- zend_mm_free_block *mm_block = heap->cache[i];
++ zend_mm_free_block *mm_block = SUHOSIN_MANGLE_PTR(heap->cache[i]);
+
+ while (mm_block) {
+ size_t size = ZEND_MM_BLOCK_SIZE(mm_block);
+- zend_mm_free_block *q = mm_block->prev_free_block;
++ zend_mm_free_block *q = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block);
+ zend_mm_block *next_block = ZEND_MM_NEXT_BLOCK(mm_block);
+
+ heap->cached -= size;
+@@ -1009,14 +1107,20 @@
+ /* }}} */
#endif
+
{
zend_mm_storage *storage;
zend_mm_heap *heap;
-@@ -1062,12 +1162,12 @@
++ zend_mm_free_block *tmp;
+
+ #if 0
+ int i;
+@@ -1050,6 +1154,12 @@
+ }
+ #endif
+
++ /* get the pointer guardian and ensure low 3 bits are 1 */
++ if (SUHOSIN_POINTER_GUARD == 0) {
++ zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD));
++ SUHOSIN_POINTER_GUARD |= 7;
++ }
++
+ if (zend_mm_low_bit(block_size) != zend_mm_high_bit(block_size)) {
+ fprintf(stderr, "'block_size' must be a power of two\n");
+ /* See http://support.microsoft.com/kb/190351 */
+@@ -1077,6 +1187,7 @@
+ #endif
+ exit(255);
+ }
++
+ heap->storage = storage;
+ heap->block_size = block_size;
+ heap->compact_size = 0;
+@@ -1097,12 +1208,12 @@
heap->reserve = NULL;
heap->reserve_size = reserve_size;
if (reserve_size > 0) {
*mm_heap = *heap;
-@@ -1098,7 +1198,11 @@
+@@ -1110,22 +1221,22 @@
+ orig = ZEND_MM_SMALL_FREE_BUCKET(heap, 0);
+ for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
+ q = p;
+- while (q->prev_free_block != orig) {
+- q = q->prev_free_block;
++ while (SUHOSIN_MANGLE_PTR(q->prev_free_block) != orig) {
++ q = SUHOSIN_MANGLE_PTR(q->prev_free_block);
+ }
+- q->prev_free_block = p;
++ q->prev_free_block = SUHOSIN_MANGLE_PTR(p);
+ q = p;
+- while (q->next_free_block != orig) {
+- q = q->next_free_block;
++ while (SUHOSIN_MANGLE_PTR(q->next_free_block) != orig) {
++ q = SUHOSIN_MANGLE_PTR(q->next_free_block);
+ }
+- q->next_free_block = p;
++ q->next_free_block = SUHOSIN_MANGLE_PTR(p);
+ p = (zend_mm_free_block*)((char*)p + sizeof(zend_mm_free_block*) * 2);
+ orig = (zend_mm_free_block*)((char*)orig + sizeof(zend_mm_free_block*) * 2);
+ if (mm_heap->large_free_buckets[i]) {
+ mm_heap->large_free_buckets[i]->parent = &mm_heap->large_free_buckets[i];
+ }
+ }
+- mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(mm_heap);
++ mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(mm_heap));
+
+ free(heap);
+ heap = mm_heap;
+@@ -1133,7 +1244,11 @@
return heap;
}
{
int i;
size_t seg_size;
-@@ -1152,6 +1256,27 @@
+@@ -1203,6 +1318,27 @@
return heap;
}
#if ZEND_DEBUG
static long zend_mm_find_leaks(zend_mm_segment *segment, zend_mm_block *b)
{
-@@ -1520,7 +1645,11 @@
+@@ -1571,7 +1707,11 @@
}
#endif
{
zend_mm_storage *storage;
zend_mm_segment *segment;
-@@ -1530,7 +1659,7 @@
+@@ -1581,7 +1721,7 @@
if (heap->reserve) {
#if ZEND_DEBUG
if (!silent) {
}
#endif
heap->reserve = NULL;
-@@ -1613,12 +1742,23 @@
+@@ -1664,12 +1804,23 @@
heap->size = 0;
heap->peak = 0;
if (heap->reserve_size) {
static void zend_mm_safe_error(zend_mm_heap *heap,
const char *format,
size_t limit,
-@@ -1629,7 +1769,11 @@
+@@ -1680,7 +1831,11 @@
size_t size)
{
if (heap->reserve) {
heap->reserve = NULL;
}
if (heap->overflow == 0) {
-@@ -1752,6 +1896,9 @@
- return best_fit->next_free_block;
+@@ -1755,7 +1910,7 @@
+ p = heap->large_free_buckets[index];
+ for (m = true_size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) {
+ if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) {
+- return p->next_free_block;
++ return SUHOSIN_MANGLE_PTR(p->next_free_block);
+ } else if (ZEND_MM_FREE_BLOCK_SIZE(p) >= true_size &&
+ ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) {
+ best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
+@@ -1779,7 +1934,7 @@
+
+ for (p = rst; p; p = p->child[p->child[0] != NULL]) {
+ if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) {
+- return p->next_free_block;
++ return SUHOSIN_MANGLE_PTR(p->next_free_block);
+ } else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size &&
+ ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) {
+ best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
+@@ -1788,7 +1943,7 @@
+ }
+
+ if (best_fit) {
+- return best_fit->next_free_block;
++ return SUHOSIN_MANGLE_PTR(best_fit->next_free_block);
+ }
+ bitmap = bitmap >> 1;
+ if (!bitmap) {
+@@ -1804,9 +1959,12 @@
+ best_fit = p;
+ }
+ }
+- return best_fit->next_free_block;
++ return SUHOSIN_MANGLE_PTR(best_fit->next_free_block);
}
+#if SUHOSIN_PATCH
static void *_zend_mm_alloc_int(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
{
zend_mm_free_block *best_fit;
-@@ -1761,7 +1908,7 @@
+@@ -1816,7 +1974,7 @@
size_t segment_size;
zend_mm_segment *segment;
int keep_rest = 0;
if (EXPECTED(ZEND_MM_SMALL_SIZE(true_size))) {
size_t index = ZEND_MM_BUCKET_INDEX(true_size);
size_t bitmap;
-@@ -1779,6 +1926,11 @@
- best_fit = heap->cache[index];
+@@ -1831,9 +1989,14 @@
+ heap->cache_stat[index].count--;
+ heap->cache_stat[index].hit++;
+ #endif
+- best_fit = heap->cache[index];
++ best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]);
heap->cache[index] = best_fit->prev_free_block;
heap->cached -= true_size;
+#if SUHOSIN_PATCH
ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
return ZEND_MM_DATA_OF(best_fit);
-@@ -1918,13 +2070,19 @@
+@@ -1847,7 +2010,7 @@
+ if (bitmap) {
+ /* Found some "small" free block that can be used */
+ index += zend_mm_low_bit(bitmap);
+- best_fit = heap->free_buckets[index*2];
++ best_fit = SUHOSIN_MANGLE_PTR(heap->free_buckets[index*2]);
+ #if ZEND_MM_CACHE_STAT
+ heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit++;
+ #endif
+@@ -1862,7 +2025,7 @@
+ best_fit = zend_mm_search_large_block(heap, true_size);
+
+ if (!best_fit && heap->real_size >= heap->limit - heap->block_size) {
+- zend_mm_free_block *p = heap->rest_buckets[0];
++ zend_mm_free_block *p = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]);
+ size_t best_size = -1;
+
+ while (p != ZEND_MM_REST_BUCKET(heap)) {
+@@ -1874,7 +2037,7 @@
+ best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
+ best_fit = p;
+ }
+- p = p->prev_free_block;
++ p = SUHOSIN_MANGLE_PTR(p->prev_free_block);
+ }
+ }
+
+@@ -1973,13 +2136,19 @@
ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 1);
return ZEND_MM_DATA_OF(best_fit);
}
-@@ -1941,12 +2099,19 @@
+@@ -1996,19 +2165,26 @@
mm_block = ZEND_MM_HEADER_OF(p);
size = ZEND_MM_BLOCK_SIZE(mm_block);
#if ZEND_MM_CACHE
if (EXPECTED(ZEND_MM_SMALL_SIZE(size)) && EXPECTED(heap->cached < ZEND_MM_CACHE_SIZE)) {
size_t index = ZEND_MM_BUCKET_INDEX(size);
-@@ -1989,6 +2154,9 @@
+ zend_mm_free_block **cache = &heap->cache[index];
+
+ ((zend_mm_free_block*)mm_block)->prev_free_block = *cache;
+- *cache = (zend_mm_free_block*)mm_block;
++ *cache = (zend_mm_free_block*)SUHOSIN_MANGLE_PTR(mm_block);
+ heap->cached += size;
+ ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED);
+ #if ZEND_MM_CACHE_STAT
+@@ -2044,6 +2220,9 @@
HANDLE_UNBLOCK_INTERRUPTIONS();
}
static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
{
zend_mm_block *mm_block = ZEND_MM_HEADER_OF(p);
-@@ -1998,11 +2166,18 @@
+@@ -2053,11 +2232,18 @@
void *ptr;
if (UNEXPECTED(!p) || !ZEND_MM_VALID_PTR(p)) {
ZEND_MM_CHECK_PROTECTION(mm_block);
if (UNEXPECTED(true_size < size)) {
-@@ -2034,6 +2209,11 @@
+@@ -2089,6 +2275,11 @@
HANDLE_UNBLOCK_INTERRUPTIONS();
}
ZEND_MM_SET_DEBUG_INFO(mm_block, size, 0, 0);
return p;
}
-@@ -2052,14 +2232,19 @@
- best_fit = heap->cache[index];
+@@ -2104,17 +2295,22 @@
+ heap->cache_stat[index].count--;
+ heap->cache_stat[index].hit++;
+ #endif
+- best_fit = heap->cache[index];
++ best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]);
heap->cache[index] = best_fit->prev_free_block;
ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
- ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
#endif
heap->cached -= true_size - orig_size;
-@@ -2075,7 +2260,6 @@
+@@ -2123,14 +2319,13 @@
+ cache = &heap->cache[index];
+
+ ((zend_mm_free_block*)mm_block)->prev_free_block = *cache;
+- *cache = (zend_mm_free_block*)mm_block;
++ *cache = (zend_mm_free_block*)SUHOSIN_MANGLE_PTR(mm_block);
+ ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED);
+ #if ZEND_MM_CACHE_STAT
+ if (++heap->cache_stat[index].count > heap->cache_stat[index].max_count) {
heap->cache_stat[index].max_count = heap->cache_stat[index].count;
}
#endif
return ptr;
}
}
-@@ -2118,6 +2302,11 @@
+@@ -2173,6 +2368,11 @@
heap->peak = heap->size;
}
HANDLE_UNBLOCK_INTERRUPTIONS();
return p;
} else if (ZEND_MM_IS_FIRST_BLOCK(mm_block) &&
ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_BLOCK_AT(next_block, ZEND_MM_FREE_BLOCK_SIZE(next_block)))) {
-@@ -2220,38 +2409,90 @@
+@@ -2275,38 +2475,74 @@
}
HANDLE_UNBLOCK_INTERRUPTIONS();
+ if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) != 0) {
+ return _zend_mm_block_size_canary((zend_mm_heap_canary *)heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+ }
++
+ if (!ZEND_MM_VALID_PTR(p)) {
+ return 0;
+ }
+@@ -2318,6 +2554,24 @@
+ return ZEND_MM_BLOCK_SIZE(mm_block);
+ #endif
+ }
++#else
++ZEND_API size_t _zend_mm_block_size_canary(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
++{
++ zend_mm_block *mm_block;
+
+ if (!ZEND_MM_VALID_PTR(p)) {
+ return 0;
+ return ZEND_MM_BLOCK_SIZE(mm_block);
+#endif
+}
-+#else
-+ZEND_API size_t _zend_mm_block_size_canary(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-+{
-+ zend_mm_block *mm_block;
+
- if (!ZEND_MM_VALID_PTR(p)) {
- return 0;
- }
-@@ -2264,6 +2505,8 @@
- #endif
- }
-
+#endif
-+
+
/**********************/
/* Allocation Manager */
- /**********************/
-@@ -2280,6 +2523,7 @@
+@@ -2335,6 +2589,7 @@
static zend_alloc_globals alloc_globals;
#endif
ZEND_API int is_zend_mm(TSRMLS_D)
{
return AG(mm_heap)->use_zend_alloc;
-@@ -2292,7 +2536,13 @@
+@@ -2347,7 +2602,13 @@
if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
return AG(mm_heap)->_malloc(size);
}
}
ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-@@ -2303,7 +2553,13 @@
+@@ -2358,7 +2619,13 @@
AG(mm_heap)->_free(ptr);
return;
}
}
ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-@@ -2313,7 +2569,13 @@
+@@ -2368,7 +2635,13 @@
if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
return AG(mm_heap)->_realloc(ptr, size);
}
}
ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
-@@ -2321,8 +2583,15 @@
+@@ -2376,8 +2649,15 @@
if (UNEXPECTED(!AG(mm_heap)->use_zend_alloc)) {
return 0;
}
#if defined(__GNUC__) && defined(i386)
-@@ -2393,7 +2662,7 @@
+@@ -2448,7 +2728,7 @@
}
#endif
ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
{
return emalloc_rel(safe_address(nmemb, size, offset));
-@@ -2506,6 +2775,7 @@
+@@ -2561,6 +2841,7 @@
{
zend_mm_shutdown(AG(mm_heap), full_shutdown, silent TSRMLS_CC);
}
static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC)
{
-@@ -2530,6 +2800,7 @@
+@@ -2585,6 +2866,7 @@
}
#endif
ZEND_API void start_memory_manager(TSRMLS_D)
{
#ifdef ZTS
-@@ -2594,6 +2865,7 @@
+@@ -2649,6 +2931,7 @@
zend_debug_alloc_output("------------------------------------------------\n");
}
#endif
/*
* Local variables:
-diff -Nura php-5.3.1RC1/Zend/zend_alloc.h suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc.h
---- php-5.3.1RC1/Zend/zend_alloc.h 2009-09-03 16:33:11.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc.h 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/Zend/zend_alloc.h suhosin-patch-5.3.9-0.9.10/Zend/zend_alloc.h
+--- php-5.3.9/Zend/zend_alloc.h 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_alloc.h 2012-01-11 19:29:07.000000000 +0100
@@ -203,6 +203,8 @@
/* Heap functions */
ZEND_API zend_mm_heap *zend_mm_startup(void);
ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC);
-diff -Nura php-5.3.1RC1/Zend/zend_alloc_canary.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc_canary.c
---- php-5.3.1RC1/Zend/zend_alloc_canary.c 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_alloc_canary.c 2009-09-27 19:08:51.000000000 +0200
-@@ -0,0 +1,2443 @@
+diff -Nura php-5.3.9/Zend/zend_alloc_canary.c suhosin-patch-5.3.9-0.9.10/Zend/zend_alloc_canary.c
+--- php-5.3.9/Zend/zend_alloc_canary.c 1970-01-01 01:00:00.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_alloc_canary.c 2012-01-11 19:30:47.000000000 +0100
+@@ -0,0 +1,2509 @@
+/*
+ +----------------------------------------------------------------------+
+ | Suhosin-Patch for PHP |
+ +----------------------------------------------------------------------+
-+ | Copyright (c) 2004-2009 Stefan Esser |
++ | Copyright (c) 2004-2011 Stefan Esser |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 2.02 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | Author: Stefan Esser <stefan.esser@sektioneins.de> |
+ +----------------------------------------------------------------------+
+ */
-+/* $Id$ */
++/* $Id: zend_alloc_canary.c, $ */
+
+#include "zend.h"
+#include "zend_alloc.h"
+static void zend_mm_panic(const char *message)
+{
+ fprintf(stderr, "%s\n", message);
++/* See http://support.microsoft.com/kb/190351 */
++#ifdef PHP_WIN32
++ fflush(stderr);
++#endif
+#if ZEND_DEBUG && defined(HAVE_KILL) && defined(HAVE_GETPID)
+ kill(getpid(), SIGSEGV);
+#endif
+# endif
+#endif
+
++static zend_intptr_t SUHOSIN_POINTER_GUARD = 0;
++
+static zend_mm_storage* zend_mm_mem_dummy_init(void *params)
+{
+ return malloc(sizeof(zend_mm_storage));
+ return NULL;
+ }
+ storage = (zend_mm_storage*)malloc(sizeof(zend_mm_storage));
++ if (storage == NULL) {
++ HeapDestroy(heap);
++ return NULL;
++ }
+ storage->data = (void*) heap;
+ return storage;
+}
+#define ZEND_MM_IS_GUARD_BLOCK(b) (((b)->info._size & ZEND_MM_TYPE_MASK) == ZEND_MM_GUARD_BLOCK)
+
+#define ZEND_MM_NEXT_BLOCK(b) ZEND_MM_BLOCK_AT(b, ZEND_MM_BLOCK_SIZE(b))
-+#define ZEND_MM_PREV_BLOCK(b) ZEND_MM_BLOCK_AT(b, -(int)((b)->info._prev & ~ZEND_MM_TYPE_MASK))
++#define ZEND_MM_PREV_BLOCK(b) ZEND_MM_BLOCK_AT(b, -(ssize_t)((b)->info._prev & ~ZEND_MM_TYPE_MASK))
+
+#define ZEND_MM_PREV_BLOCK_IS_FREE(b) (!((b)->info._prev & ZEND_MM_USED_BLOCK))
+
+ mm_block->parent = NULL;
+ }
+
-+ prev = heap->rest_buckets[0];
-+ next = prev->next_free_block;
-+ mm_block->prev_free_block = prev;
-+ mm_block->next_free_block = next;
-+ prev->next_free_block = next->prev_free_block = mm_block;
++ prev = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]);
++ next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
+}
+
+static void zend_mm_add_to_free_list(zend_mm_heap_canary *heap, zend_mm_free_block_canary *mm_block)
+ if (!*p) {
+ *p = mm_block;
+ mm_block->parent = p;
-+ mm_block->prev_free_block = mm_block->next_free_block = mm_block;
++ mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block);
+ heap->large_free_bitmap |= (ZEND_MM_LONG_CONST(1) << index);
+ } else {
+ size_t m;
+ if (!*p) {
+ *p = mm_block;
+ mm_block->parent = p;
-+ mm_block->prev_free_block = mm_block->next_free_block = mm_block;
++ mm_block->prev_free_block = mm_block->next_free_block = SUHOSIN_MANGLE_PTR(mm_block);
+ break;
+ }
+ } else {
-+ zend_mm_free_block_canary *next = prev->next_free_block;
++ zend_mm_free_block_canary *next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
+
-+ prev->next_free_block = next->prev_free_block = mm_block;
-+ mm_block->next_free_block = next;
-+ mm_block->prev_free_block = prev;
++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
+ mm_block->parent = NULL;
+ break;
+ }
+ index = ZEND_MM_BUCKET_INDEX(size);
+
+ prev = ZEND_MM_SMALL_FREE_BUCKET(heap, index);
-+ if (prev->prev_free_block == prev) {
++ if (SUHOSIN_MANGLE_PTR(prev->prev_free_block) == prev) {
+ heap->free_bitmap |= (ZEND_MM_LONG_CONST(1) << index);
+ }
-+ next = prev->next_free_block;
++ next = SUHOSIN_MANGLE_PTR(prev->next_free_block);
+
-+ mm_block->prev_free_block = prev;
-+ mm_block->next_free_block = next;
-+ prev->next_free_block = next->prev_free_block = mm_block;
++ mm_block->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
++ mm_block->next_free_block = SUHOSIN_MANGLE_PTR(next);
++ prev->next_free_block = next->prev_free_block = SUHOSIN_MANGLE_PTR(mm_block);
+ }
+}
+
+static void zend_mm_remove_from_free_list(zend_mm_heap_canary *heap, zend_mm_free_block_canary *mm_block)
+{
-+ zend_mm_free_block_canary *prev = mm_block->prev_free_block;
-+ zend_mm_free_block_canary *next = mm_block->next_free_block;
++ zend_mm_free_block_canary *prev = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block);
++ zend_mm_free_block_canary *next = SUHOSIN_MANGLE_PTR(mm_block->next_free_block);
+
+ ZEND_MM_CHECK_MAGIC(mm_block, MEM_BLOCK_FREED);
+
+ } else {
+
+#if SUHOSIN_PATCH
-+ if (prev->next_free_block != mm_block || next->prev_free_block != mm_block) {
++ if (SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block || SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block) {
+ zend_suhosin_log(S_MEMORY, "zend_mm_head corrupted at %p", mm_block);
+ _exit(1);
+ }
+#endif
+
+#if ZEND_MM_SAFE_UNLINKING
-+ if (UNEXPECTED(prev->next_free_block != mm_block) || UNEXPECTED(next->prev_free_block != mm_block)) {
++ if (UNEXPECTED(SUHOSIN_MANGLE_PTR(prev->next_free_block) != mm_block) || UNEXPECTED(SUHOSIN_MANGLE_PTR(next->prev_free_block) != mm_block)) {
+ zend_mm_panic("zend_mm_heap corrupted");
+ }
+#endif
+
-+ prev->next_free_block = next;
-+ next->prev_free_block = prev;
++ prev->next_free_block = SUHOSIN_MANGLE_PTR(next);
++ next->prev_free_block = SUHOSIN_MANGLE_PTR(prev);
+
+ if (EXPECTED(ZEND_MM_SMALL_SIZE(ZEND_MM_FREE_BLOCK_SIZE(mm_block)))) {
+ if (EXPECTED(prev == next)) {
+#endif
+ p = ZEND_MM_SMALL_FREE_BUCKET(heap, 0);
+ for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
-+ p->next_free_block = p;
-+ p->prev_free_block = p;
++ p->next_free_block = SUHOSIN_MANGLE_PTR(p);
++ p->prev_free_block = SUHOSIN_MANGLE_PTR(p);
+ p = (zend_mm_free_block_canary*)((char*)p + sizeof(zend_mm_free_block_canary*) * 2);
+ heap->large_free_buckets[i] = NULL;
+ }
-+ heap->rest_buckets[0] = heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(heap);
++ heap->rest_buckets[0] = heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(heap));
+#if SUHOSIN_PATCH
+ if (SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION)) {
-+ heap->canary_1 = zend_canary();
-+ heap->canary_2 = zend_canary();
-+ heap->canary_3 = zend_canary();
++ zend_canary(&heap->canary_1, sizeof(heap->canary_1));
++ zend_canary(&heap->canary_2, sizeof(heap->canary_2));
++ zend_canary(&heap->canary_3, sizeof(heap->canary_3));
+ }
+#endif
+}
+ int i;
+
+ for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
++ /* SUHOSIN_MANGLE_PTR should NOT affect NULL pointers */
+ if (heap->cache[i]) {
-+ zend_mm_free_block_canary *mm_block = heap->cache[i];
++ zend_mm_free_block_canary *mm_block = SUHOSIN_MANGLE_PTR(heap->cache[i]);
+
+ while (mm_block) {
+ size_t size = ZEND_MM_BLOCK_SIZE(mm_block);
-+ zend_mm_free_block_canary *q = mm_block->prev_free_block;
++ zend_mm_free_block_canary *q = SUHOSIN_MANGLE_PTR(mm_block->prev_free_block);
+ zend_mm_block_canary *next_block = ZEND_MM_NEXT_BLOCK(mm_block);
+
+ heap->cached -= size;
+#endif
+
+#if ZEND_MM_HEAP_PROTECTION || ZEND_MM_COOKIES
-+static void zend_mm_random(unsigned char *buf, size_t size)
++static void zend_mm_random(unsigned char *buf, size_t size) /* {{{ */
+{
+ size_t i = 0;
+ unsigned char t;
+
+#ifdef ZEND_WIN32
+ HCRYPTPROV hCryptProv;
-+
-+ if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
++ int has_context = 0;
++
++ if (!CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, 0)) {
++ /* Could mean that the key container does not exist, let try
++ again by asking for a new one */
++ if (GetLastError() == NTE_BAD_KEYSET) {
++ if (CryptAcquireContext(&hCryptProv, NULL, NULL, PROV_RSA_FULL, CRYPT_NEWKEYSET)) {
++ has_context = 1;
++ }
++ }
++ } else {
++ has_context = 1;
++ }
++ if (has_context) {
+ do {
+ BOOL ret = CryptGenRandom(hCryptProv, size, buf);
+ CryptReleaseContext(hCryptProv, 0);
+ i++;
+ }
+ if (i == size) {
-+ return;
++ return;
+ }
+ }
+ } while (0);
+ t = buf[i++] << 1;
+ }
+}
++/* }}} */
+#endif
+
+
+{
+ zend_mm_storage *storage;
+ zend_mm_heap_canary *heap;
++ zend_mm_free_block_canary *tmp;
+
+#if 0
+ int i;
+ }
+#endif
+
++ /* get the pointer guardian and ensure low 3 bits are 1 */
++ if (SUHOSIN_POINTER_GUARD == 0) {
++ zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD));
++ SUHOSIN_POINTER_GUARD |= 7;
++ }
++
+ if (zend_mm_low_bit(block_size) != zend_mm_high_bit(block_size)) {
+ fprintf(stderr, "'block_size' must be a power of two\n");
++/* See http://support.microsoft.com/kb/190351 */
++#ifdef PHP_WIN32
++ fflush(stderr);
++#endif
+ exit(255);
+ }
+ storage = handlers->init(params);
+ if (!storage) {
+ fprintf(stderr, "Cannot initialize zend_mm storage [%s]\n", handlers->name);
++/* See http://support.microsoft.com/kb/190351 */
++#ifdef PHP_WIN32
++ fflush(stderr);
++#endif
+ exit(255);
+ }
+ storage->handlers = handlers;
+
+ heap = malloc(sizeof(struct _zend_mm_heap_canary));
++ if (heap == NULL) {
++ fprintf(stderr, "Cannot allocate heap for zend_mm storage [%s]\n", handlers->name);
++#ifdef PHP_WIN32
++ fflush(stderr);
++#endif
++ exit(255);
++ }
+
+ heap->storage = storage;
+ heap->block_size = block_size;
+ orig = ZEND_MM_SMALL_FREE_BUCKET(heap, 0);
+ for (i = 0; i < ZEND_MM_NUM_BUCKETS; i++) {
+ q = p;
-+ while (q->prev_free_block != orig) {
-+ q = q->prev_free_block;
++ while (SUHOSIN_MANGLE_PTR(q->prev_free_block) != orig) {
++ q = SUHOSIN_MANGLE_PTR(q->prev_free_block);
+ }
-+ q->prev_free_block = p;
++ q->prev_free_block = SUHOSIN_MANGLE_PTR(p);
+ q = p;
-+ while (q->next_free_block != orig) {
-+ q = q->next_free_block;
++ while (SUHOSIN_MANGLE_PTR(q->next_free_block) != orig) {
++ q = SUHOSIN_MANGLE_PTR(q->next_free_block);
+ }
-+ q->next_free_block = p;
++ q->next_free_block = SUHOSIN_MANGLE_PTR(p);
+ p = (zend_mm_free_block_canary*)((char*)p + sizeof(zend_mm_free_block_canary*) * 2);
+ orig = (zend_mm_free_block_canary*)((char*)orig + sizeof(zend_mm_free_block_canary*) * 2);
+ if (mm_heap->large_free_buckets[i]) {
+ mm_heap->large_free_buckets[i]->parent = &mm_heap->large_free_buckets[i];
+ }
+ }
-+ mm_heap->rest_buckets[0]->next_free_block = mm_heap->rest_buckets[1]->prev_free_block = ZEND_MM_REST_BUCKET(mm_heap);
++ mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = SUHOSIN_MANGLE_PTR(ZEND_MM_REST_BUCKET(mm_heap));
+
+ free(heap);
+ heap = mm_heap;
+ if (!mem_handlers[i].name) {
+ fprintf(stderr, "Wrong or unsupported zend_mm storage type '%s'\n", mem_type);
+ fprintf(stderr, " supported types:\n");
++/* See http://support.microsoft.com/kb/190351 */
++#ifdef PHP_WIN32
++ fflush(stderr);
++#endif
+ for (i = 0; mem_handlers[i].name; i++) {
+ fprintf(stderr, " '%s'\n", mem_handlers[i].name);
+ }
++/* See http://support.microsoft.com/kb/190351 */
++#ifdef PHP_WIN32
++ fflush(stderr);
++#endif
+ exit(255);
+ }
+ }
+ seg_size = zend_atoi(tmp, 0);
+ if (zend_mm_low_bit(seg_size) != zend_mm_high_bit(seg_size)) {
+ fprintf(stderr, "ZEND_MM_SEG_SIZE must be a power of two\n");
++/* See http://support.microsoft.com/kb/190351 */
++#ifdef PHP_WIN32
++ fflush(stderr);
++#endif
+ exit(255);
+ } else if (seg_size < ZEND_MM_ALIGNED_SEGMENT_SIZE + ZEND_MM_ALIGNED_HEADER_SIZE) {
+ fprintf(stderr, "ZEND_MM_SEG_SIZE is too small\n");
++/* See http://support.microsoft.com/kb/190351 */
++#ifdef PHP_WIN32
++ fflush(stderr);
++#endif
+ exit(255);
+ }
+ } else {
+ size);
+ fprintf(stderr, " in %s on line %d\n", error_filename, error_lineno);
+ }
++/* See http://support.microsoft.com/kb/190351 */
++#ifdef PHP_WIN32
++ fflush(stderr);
++#endif
+ } zend_end_try();
+ } else {
+ heap->overflow = 2;
+ p = heap->large_free_buckets[index];
+ for (m = true_size << (ZEND_MM_NUM_BUCKETS - index); ; m <<= 1) {
+ if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) {
-+ return p->next_free_block;
++ return SUHOSIN_MANGLE_PTR(p->next_free_block);
+ } else if (ZEND_MM_FREE_BLOCK_SIZE(p) >= true_size &&
+ ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) {
+ best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
+
+ for (p = rst; p; p = p->child[p->child[0] != NULL]) {
+ if (UNEXPECTED(ZEND_MM_FREE_BLOCK_SIZE(p) == true_size)) {
-+ return p->next_free_block;
++ return SUHOSIN_MANGLE_PTR(p->next_free_block);
+ } else if (ZEND_MM_FREE_BLOCK_SIZE(p) > true_size &&
+ ZEND_MM_FREE_BLOCK_SIZE(p) < best_size) {
+ best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
+ }
+
+ if (best_fit) {
-+ return best_fit->next_free_block;
++ return SUHOSIN_MANGLE_PTR(best_fit->next_free_block);
+ }
+ bitmap = bitmap >> 1;
+ if (!bitmap) {
+ best_fit = p;
+ }
+ }
-+ return best_fit->next_free_block;
++ return SUHOSIN_MANGLE_PTR(best_fit->next_free_block);
+}
+
+void *_zend_mm_alloc_canary_int(zend_mm_heap_canary *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+ heap->cache_stat[index].count--;
+ heap->cache_stat[index].hit++;
+#endif
-+ best_fit = heap->cache[index];
++ best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]);
+ heap->cache[index] = best_fit->prev_free_block;
+ heap->cached -= true_size;
+#if SUHOSIN_PATCH
+ if (bitmap) {
+ /* Found some "small" free block that can be used */
+ index += zend_mm_low_bit(bitmap);
-+ best_fit = heap->free_buckets[index*2];
++ best_fit = SUHOSIN_MANGLE_PTR(heap->free_buckets[index*2]);
+#if ZEND_MM_CACHE_STAT
+ heap->cache_stat[ZEND_MM_NUM_BUCKETS].hit++;
+#endif
+ best_fit = zend_mm_search_large_block(heap, true_size);
+
+ if (!best_fit && heap->real_size >= heap->limit - heap->block_size) {
-+ zend_mm_free_block_canary *p = heap->rest_buckets[0];
++ zend_mm_free_block_canary *p = SUHOSIN_MANGLE_PTR(heap->rest_buckets[0]);
+ size_t best_size = -1;
+
+ while (p != ZEND_MM_REST_BUCKET(heap)) {
+ best_size = ZEND_MM_FREE_BLOCK_SIZE(p);
+ best_fit = p;
+ }
-+ p = p->prev_free_block;
++ p = SUHOSIN_MANGLE_PTR(p->prev_free_block);
+ }
+ }
+
+ zend_mm_free_block_canary **cache = &heap->cache[index];
+
+ ((zend_mm_free_block_canary*)mm_block)->prev_free_block = *cache;
-+ *cache = (zend_mm_free_block_canary*)mm_block;
++ *cache = (zend_mm_free_block_canary*)SUHOSIN_MANGLE_PTR(mm_block);
+ heap->cached += size;
+ ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED);
+#if ZEND_MM_CACHE_STAT
+ heap->cache_stat[index].count--;
+ heap->cache_stat[index].hit++;
+#endif
-+ best_fit = heap->cache[index];
++ best_fit = SUHOSIN_MANGLE_PTR(heap->cache[index]);
+ heap->cache[index] = best_fit->prev_free_block;
+ ZEND_MM_CHECK_MAGIC(best_fit, MEM_BLOCK_CACHED);
+ ZEND_MM_SET_DEBUG_INFO(best_fit, size, 1, 0);
+ cache = &heap->cache[index];
+
+ ((zend_mm_free_block_canary*)mm_block)->prev_free_block = *cache;
-+ *cache = (zend_mm_free_block_canary*)mm_block;
++ *cache = (zend_mm_free_block_canary*)SUHOSIN_MANGLE_PTR(mm_block);
+ ZEND_MM_SET_MAGIC(mm_block, MEM_BLOCK_CACHED);
+#if ZEND_MM_CACHE_STAT
+ if (++heap->cache_stat[index].count > heap->cache_stat[index].max_count) {
+ * End:
+ */
+
-diff -Nura php-5.3.1RC1/Zend/zend_canary.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_canary.c
---- php-5.3.1RC1/Zend/zend_canary.c 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_canary.c 2009-09-27 19:04:06.000000000 +0200
-@@ -0,0 +1,64 @@
+diff -Nura php-5.3.9/Zend/zend_canary.c suhosin-patch-5.3.9-0.9.10/Zend/zend_canary.c
+--- php-5.3.9/Zend/zend_canary.c 1970-01-01 01:00:00.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_canary.c 2012-01-11 19:29:07.000000000 +0100
+@@ -0,0 +1,66 @@
+/*
+ +----------------------------------------------------------------------+
+ | Suhosin-Patch for PHP |
+ | Author: Stefan Esser <stefan.esser@sektioneins.de> |
+ +----------------------------------------------------------------------+
+ */
-+/* $Id$ */
++/* $Id: zend_canary.c,v 1.1 2004/11/26 12:45:41 ionic Exp $ */
+
+#include "zend.h"
+
+static size_t last_canary = 0x73625123;
+
+/* will be replaced later with more compatible method */
-+ZEND_API size_t zend_canary()
++ZEND_API void zend_canary(void *buf, int len)
+{
+ time_t t;
+ size_t canary;
+#ifndef PHP_WIN32
+ fd = open("/dev/urandom", 0);
+ if (fd != -1) {
-+ int r = read(fd, &canary, sizeof(canary));
++ int r = read(fd, buf, len);
+ close(fd);
-+ if (r == sizeof(canary)) {
-+ return (canary);
++ if (r == len) {
++ return;
+ }
+ }
+#endif
+ time(&t);
+ canary = *(unsigned int *)&t + getpid() << 16 + last_canary;
+ last_canary ^= (canary << 5) | (canary >> (32-5));
-+ return (canary);
++ /* When we ensure full win32 compatibility in next version
++ we will replace this with the random number code from zend_alloc.c */
++ memcpy(buf, &canary, len);
+}
+
+#endif
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-diff -Nura php-5.3.1RC1/Zend/zend_compile.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_compile.c
---- php-5.3.1RC1/Zend/zend_compile.c 2009-09-03 16:33:11.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_compile.c 2009-09-27 19:09:53.000000000 +0200
+diff -Nura php-5.3.9/Zend/zend_compile.c suhosin-patch-5.3.9-0.9.10/Zend/zend_compile.c
+--- php-5.3.9/Zend/zend_compile.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_compile.c 2012-01-11 19:29:07.000000000 +0100
@@ -73,6 +73,11 @@
}
/* }}} */
static void build_runtime_defined_function_key(zval *result, const char *name, int name_length TSRMLS_DC) /* {{{ */
{
char char_pos_buf[32];
-diff -Nura php-5.3.1RC1/Zend/zend_compile.h suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_compile.h
---- php-5.3.1RC1/Zend/zend_compile.h 2009-06-06 01:20:59.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_compile.h 2009-09-27 19:04:06.000000000 +0200
-@@ -606,6 +606,11 @@
+diff -Nura php-5.3.9/Zend/zend_compile.h suhosin-patch-5.3.9-0.9.10/Zend/zend_compile.h
+--- php-5.3.9/Zend/zend_compile.h 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_compile.h 2012-01-11 19:29:07.000000000 +0100
+@@ -607,6 +607,11 @@
ZEND_API int zend_auto_global_disable_jit(const char *varname, zend_uint varname_length TSRMLS_DC);
ZEND_API size_t zend_dirname(char *path, size_t len);
int zendlex(znode *zendlval TSRMLS_DC);
/* BEGIN: OPCODES */
-diff -Nura php-5.3.1RC1/Zend/zend_constants.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_constants.c
---- php-5.3.1RC1/Zend/zend_constants.c 2009-01-12 22:54:37.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_constants.c 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/Zend/zend_constants.c suhosin-patch-5.3.9-0.9.10/Zend/zend_constants.c
+--- php-5.3.9/Zend/zend_constants.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_constants.c 2012-01-11 19:29:07.000000000 +0100
@@ -113,6 +113,76 @@
REGISTER_MAIN_LONG_CONSTANT("E_ALL", E_ALL, CONST_PERSISTENT | CONST_CS);
+#endif
+#endif
+
+ REGISTER_MAIN_LONG_CONSTANT("DEBUG_BACKTRACE_PROVIDE_OBJECT", DEBUG_BACKTRACE_PROVIDE_OBJECT, CONST_PERSISTENT | CONST_CS);
+ REGISTER_MAIN_LONG_CONSTANT("DEBUG_BACKTRACE_IGNORE_ARGS", DEBUG_BACKTRACE_IGNORE_ARGS, CONST_PERSISTENT | CONST_CS);
/* true/false constants */
- {
- zend_constant c;
-diff -Nura php-5.3.1RC1/Zend/zend_errors.h suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_errors.h
---- php-5.3.1RC1/Zend/zend_errors.h 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_errors.h 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/Zend/zend_errors.h suhosin-patch-5.3.9-0.9.10/Zend/zend_errors.h
+--- php-5.3.9/Zend/zend_errors.h 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_errors.h 2012-01-11 19:29:07.000000000 +0100
@@ -41,6 +41,20 @@
#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 | E_DEPRECATED | E_USER_DEPRECATED)
#define E_CORE (E_CORE_ERROR | E_CORE_WARNING)
#endif /* ZEND_ERRORS_H */
/*
-diff -Nura php-5.3.1RC1/Zend/zend_hash.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_hash.c
---- php-5.3.1RC1/Zend/zend_hash.c 2009-06-07 21:28:15.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_hash.c 2009-09-27 19:10:51.000000000 +0200
+diff -Nura php-5.3.9/Zend/zend_hash.c suhosin-patch-5.3.9-0.9.10/Zend/zend_hash.c
+--- php-5.3.9/Zend/zend_hash.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_hash.c 2012-01-11 19:29:07.000000000 +0100
@@ -20,6 +20,7 @@
- /* $Id$ */
+ /* $Id: zend_hash.c 321634 2012-01-01 13:15:04Z felipe $ */
#include "zend.h"
+#include "zend_compile.h"
#define CONNECT_TO_BUCKET_DLLIST(element, list_head) \
(element)->pNext = (list_head); \
-@@ -133,6 +134,191 @@
+@@ -136,6 +137,199 @@
}
+ return;
+ }
+
++ } else {
++ zend_hash_dprot_end_read();
++
++ zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown Hashtable destructor");
++ if (SUHOSIN_CONFIG(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR) == 0) {
++ _exit(1);
++ }
++ return;
+ }
+
+ zend_hash_dprot_end_read();
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)
{
-@@ -153,6 +339,7 @@
+@@ -156,6 +350,7 @@
ht->nTableMask = ht->nTableSize - 1;
ht->pDestructor = pDestructor;
ht->arBuckets = NULL;
ht->pListHead = NULL;
ht->pListTail = NULL;
-@@ -230,6 +417,7 @@
+@@ -233,6 +428,7 @@
return FAILURE;
}
#endif
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -295,6 +483,7 @@
+@@ -298,6 +494,7 @@
return FAILURE;
}
#endif
-+ zend_hash_check_destructor(ht->pDestructor);
++ zend_hash_check_destructor(ht->pDestructor);
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -370,6 +559,7 @@
+@@ -373,6 +570,7 @@
return FAILURE;
}
#endif
-+ zend_hash_check_destructor(ht->pDestructor);
++ zend_hash_check_destructor(ht->pDestructor);
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -493,6 +683,7 @@
+@@ -496,6 +694,7 @@
if (ht->pInternalPointer == p) {
ht->pInternalPointer = p->pListNext;
}
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-@@ -519,6 +710,7 @@
+@@ -522,6 +721,7 @@
SET_INCONSISTENT(HT_IS_DESTROYING);
p = ht->pListHead;
while (p != NULL) {
q = p;
p = p->pListNext;
-@@ -545,6 +737,7 @@
- SET_INCONSISTENT(HT_CLEANING);
+@@ -554,6 +754,7 @@
+ ht->nNextFreeElement = 0;
+ ht->pInternalPointer = NULL;
- p = ht->pListHead;
+ zend_hash_check_destructor(ht->pDestructor);
while (p != NULL) {
q = p;
p = p->pListNext;
-@@ -607,6 +800,7 @@
+@@ -608,6 +809,7 @@
ht->nNumOfElements--;
HANDLE_UNBLOCK_INTERRUPTIONS();
-+ zend_hash_check_destructor(ht->pDestructor);
++ zend_hash_check_destructor(ht->pDestructor);
if (ht->pDestructor) {
ht->pDestructor(p->pData);
}
-diff -Nura php-5.3.1RC1/Zend/zend_llist.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_llist.c
---- php-5.3.1RC1/Zend/zend_llist.c 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_llist.c 2009-09-27 19:11:28.000000000 +0200
-@@ -23,6 +23,186 @@
+@@ -628,6 +830,7 @@
+ IS_CONSISTENT(ht);
+
+ p = ht->pListHead;
++ zend_hash_check_destructor(ht->pDestructor);
+ while (p != NULL) {
+ p = zend_hash_apply_deleter(ht, p);
+ }
+@@ -1180,6 +1383,7 @@
+
+ IS_CONSISTENT(ht);
+
++ zend_hash_check_destructor(ht->pDestructor);
+ if (p) {
+ if (key_type == HASH_KEY_IS_LONG) {
+ str_length = 0;
+diff -Nura php-5.3.9/Zend/zend_llist.c suhosin-patch-5.3.9-0.9.10/Zend/zend_llist.c
+--- php-5.3.9/Zend/zend_llist.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_llist.c 2012-01-11 19:29:07.000000000 +0100
+@@ -23,6 +23,194 @@
#include "zend_llist.h"
#include "zend_qsort.h"
+ return;
+ }
+
++ } else {
++ zend_llist_dprot_end_read();
++
++ zend_suhosin_log(S_MEMORY, "possible memory corruption detected - unknown llist destructor");
++ if (SUHOSIN_CONFIG(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR) == 0) {
++ _exit(1);
++ }
++ return;
+ }
+
+ zend_llist_dprot_end_read();
ZEND_API void zend_llist_init(zend_llist *l, size_t size, llist_dtor_func_t dtor, unsigned char persistent)
{
l->head = NULL;
-@@ -30,6 +210,7 @@
+@@ -30,6 +218,7 @@
l->count = 0;
l->size = size;
l->dtor = dtor;
l->persistent = persistent;
}
-@@ -81,6 +262,7 @@
+@@ -81,6 +270,7 @@
} else {\
(l)->tail = (current)->prev;\
}\
if ((l)->dtor) {\
(l)->dtor((current)->data);\
}\
-@@ -108,6 +290,7 @@
+@@ -108,6 +298,7 @@
{
zend_llist_element *current=l->head, *next;
while (current) {
next = current->next;
if (l->dtor) {
-@@ -133,6 +316,7 @@
+@@ -133,6 +324,7 @@
zend_llist_element *old_tail;
void *data;
if ((old_tail = l->tail)) {
if (old_tail->prev) {
old_tail->prev->next = NULL;
-diff -Nura php-5.3.1RC1/Zend/zend_operators.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_operators.c
---- php-5.3.1RC1/Zend/zend_operators.c 2009-06-04 20:20:45.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_operators.c 2009-09-27 19:04:06.000000000 +0200
-@@ -152,9 +152,14 @@
+diff -Nura php-5.3.9/Zend/zend_operators.c suhosin-patch-5.3.9-0.9.10/Zend/zend_operators.c
+--- php-5.3.9/Zend/zend_operators.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_operators.c 2012-01-11 19:29:07.000000000 +0100
+@@ -153,9 +153,14 @@
case IS_STRING:
{
char *strval;
ZVAL_LONG(op, 0);
}
STR_FREE(strval);
-@@ -186,7 +191,8 @@
+@@ -187,7 +192,8 @@
} else { \
switch (Z_TYPE_P(op)) { \
case IS_STRING: \
if ((Z_TYPE(holder)=is_numeric_string(Z_STRVAL_P(op), Z_STRLEN_P(op), &Z_LVAL(holder), &Z_DVAL(holder), 1)) == 0) { \
ZVAL_LONG(&(holder), 0); \
} \
-@@ -228,6 +234,7 @@
+@@ -229,6 +235,7 @@
Z_LVAL(holder) = zend_dval_to_lval(Z_DVAL_P(op)); \
break; \
case IS_STRING: \
Z_LVAL(holder) = strtol(Z_STRVAL_P(op), NULL, 10); \
break; \
case IS_ARRAY: \
-@@ -270,6 +277,7 @@
+@@ -271,6 +278,7 @@
Z_LVAL(holder) = (Z_DVAL_P(op) ? 1 : 0); \
break; \
case IS_STRING: \
if (Z_STRLEN_P(op) == 0 \
|| (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) { \
Z_LVAL(holder) = 0; \
-@@ -355,6 +363,9 @@
+@@ -356,6 +364,9 @@
{
char *strval = Z_STRVAL_P(op);
Z_LVAL_P(op) = strtol(strval, NULL, base);
STR_FREE(strval);
}
-@@ -415,6 +426,9 @@
+@@ -416,6 +427,9 @@
{
char *strval = Z_STRVAL_P(op);
Z_DVAL_P(op) = zend_strtod(strval, NULL);
STR_FREE(strval);
}
-@@ -501,8 +515,14 @@
+@@ -502,8 +516,14 @@
if (Z_STRLEN_P(op) == 0
|| (Z_STRLEN_P(op)==1 && Z_STRVAL_P(op)[0]=='0')) {
Z_LVAL_P(op) = 1;
}
STR_FREE(strval);
-@@ -616,6 +636,9 @@
+@@ -617,6 +637,9 @@
*entry = *op;
INIT_PZVAL(entry);
switch (type) {
case IS_ARRAY:
ALLOC_HASHTABLE(Z_ARRVAL_P(op));
-diff -Nura php-5.3.1RC1/Zend/zend_variables.c suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_variables.c
---- php-5.3.1RC1/Zend/zend_variables.c 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/Zend/zend_variables.c 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/Zend/zend_variables.c suhosin-patch-5.3.9-0.9.10/Zend/zend_variables.c
+--- php-5.3.9/Zend/zend_variables.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/Zend/zend_variables.c 2012-01-11 19:29:07.000000000 +0100
@@ -34,6 +34,9 @@
case IS_CONSTANT:
CHECK_ZVAL_STRING_REL(zvalue);
break;
case IS_ARRAY:
case IS_CONSTANT_ARRAY:
-diff -Nura php-5.3.1RC1/configure suhosin-patch-5.3.1RC1-0.9.8/configure
---- php-5.3.1RC1/configure 2009-09-04 01:11:27.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/configure 2009-09-27 19:04:06.000000000 +0200
-@@ -17600,6 +17600,9 @@
-
- fi
-
-+cat >> confdefs.h <<\EOF
-+#define SUHOSIN_PATCH 1
-+EOF
-
- echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
- echo "configure:17606: checking for declared timezone" >&5
-@@ -112443,7 +112446,7 @@
- php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
- strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
- network.c php_open_temporary_file.c php_logos.c \
-- output.c getopt.c; do
-+ output.c getopt.c suhosin_patch.c ; do
-
- IFS=.
- set $ac_src
-@@ -112647,7 +112650,7 @@
- zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
- zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
- zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \
-- zend_closures.c zend_float.c; do
-+ zend_closures.c zend_float.c zend_canary.c zend_alloc_canary.c ; do
-
- IFS=.
- set $ac_src
-diff -Nura php-5.3.1RC1/configure.in suhosin-patch-5.3.1RC1-0.9.8/configure.in
---- php-5.3.1RC1/configure.in 2009-09-03 23:30:56.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/configure.in 2009-09-27 19:04:06.000000000 +0200
-@@ -304,6 +304,7 @@
+diff -Nura php-5.3.9/configure.in suhosin-patch-5.3.9-0.9.10/configure.in
+--- php-5.3.9/configure.in 2012-01-10 12:21:57.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/configure.in 2012-01-11 19:29:07.000000000 +0100
+@@ -289,6 +289,7 @@
sinclude(TSRM/threads.m4)
sinclude(TSRM/tsrm.m4)
divert(2)
-@@ -1407,7 +1408,7 @@
+@@ -1406,7 +1407,7 @@
php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
network.c php_open_temporary_file.c php_logos.c \
PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c \
-@@ -1435,7 +1436,7 @@
+@@ -1434,7 +1435,7 @@
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \
if test -r "$abs_srcdir/Zend/zend_objects.c"; then
PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c)
-diff -Nura php-5.3.1RC1/ext/standard/dl.c suhosin-patch-5.3.1RC1-0.9.8/ext/standard/dl.c
---- php-5.3.1RC1/ext/standard/dl.c 2009-08-06 03:33:54.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/ext/standard/dl.c 2009-09-27 19:04:06.000000000 +0200
-@@ -244,6 +244,23 @@
+diff -Nura php-5.3.9/ext/standard/dl.c suhosin-patch-5.3.9-0.9.10/ext/standard/dl.c
+--- php-5.3.9/ext/standard/dl.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/ext/standard/dl.c 2012-01-11 19:29:07.000000000 +0100
+@@ -254,6 +254,23 @@
return FAILURE;
}
}
return SUCCESS;
}
/* }}} */
-diff -Nura php-5.3.1RC1/ext/standard/info.c suhosin-patch-5.3.1RC1-0.9.8/ext/standard/info.c
---- php-5.3.1RC1/ext/standard/info.c 2009-01-17 03:05:13.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/ext/standard/info.c 2009-09-27 19:04:06.000000000 +0200
-@@ -842,6 +842,33 @@
+diff -Nura php-5.3.9/ext/standard/info.c suhosin-patch-5.3.9-0.9.10/ext/standard/info.c
+--- php-5.3.9/ext/standard/info.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/ext/standard/info.c 2012-01-11 22:54:58.000000000 +0100
+@@ -878,6 +878,33 @@
php_info_print_table_end();
+ PUTS(!sapi_module.phpinfo_as_text?"<br />":"\n");
+ if (sapi_module.phpinfo_as_text) {
+ PUTS("Copyright (c) 2006-2007 Hardened-PHP Project\n");
-+ PUTS("Copyright (c) 2007-2009 SektionEins GmbH\n");
++ PUTS("Copyright (c) 2007-2012 SektionEins GmbH\n");
+ } else {
+ PUTS("Copyright (c) 2006-2007 <a href=\"http://www.hardened-php.net/\">Hardened-PHP Project</a>\n");
-+ PUTS("Copyright (c) 2007-20
09 <a href=\"http://www.sektioneins.de/\">SektionEins GmbH</a>\n");
++ PUTS("Copyright (c) 2007-20
12 <a href=\"http://www.sektioneins.de/\">SektionEins GmbH</a>\n");
+ }
+ php_info_print_box_end();
+
/* Zend Engine */
php_info_print_box_start(0);
if (expose_php && !sapi_module.phpinfo_as_text) {
-diff -Nura php-5.3.1RC1/ext/standard/syslog.c suhosin-patch-5.3.1RC1-0.9.8/ext/standard/syslog.c
---- php-5.3.1RC1/ext/standard/syslog.c 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/ext/standard/syslog.c 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/ext/standard/syslog.c suhosin-patch-5.3.9-0.9.10/ext/standard/syslog.c
+--- php-5.3.9/ext/standard/syslog.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/ext/standard/syslog.c 2012-01-11 19:29:07.000000000 +0100
@@ -42,6 +42,7 @@
*/
PHP_MINIT_FUNCTION(syslog)
BG(syslog_device)=NULL;
return SUCCESS;
-diff -Nura php-5.3.1RC1/main/fopen_wrappers.c suhosin-patch-5.3.1RC1-0.9.8/main/fopen_wrappers.c
---- php-5.3.1RC1/main/fopen_wrappers.c 2009-07-31 23:09:45.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/fopen_wrappers.c 2009-09-27 19:32:39.000000000 +0200
+diff -Nura php-5.3.9/main/fopen_wrappers.c suhosin-patch-5.3.9-0.9.10/main/fopen_wrappers.c
+--- php-5.3.9/main/fopen_wrappers.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/main/fopen_wrappers.c 2012-01-11 19:29:07.000000000 +0100
@@ -85,13 +85,8 @@
PHPAPI ZEND_INI_MH(OnUpdateBaseDir)
{
if (stage == PHP_INI_STAGE_STARTUP || stage == PHP_INI_STAGE_SHUTDOWN || stage == PHP_INI_STAGE_ACTIVATE || stage == PHP_INI_STAGE_DEACTIVATE) {
/* We're in a PHP_INI_SYSTEM context, no restrictions */
-diff -Nura php-5.3.1RC1/main/main.c suhosin-patch-5.3.1RC1-0.9.8/main/main.c
---- php-5.3.1RC1/main/main.c 2009-07-29 02:17:10.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/main.c 2009-09-27 19:04:06.000000000 +0200
-@@ -90,6 +90,9 @@
+diff -Nura php-5.3.9/main/main.c suhosin-patch-5.3.9-0.9.10/main/main.c
+--- php-5.3.9/main/main.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/main/main.c 2012-01-11 19:29:07.000000000 +0100
+@@ -91,6 +91,9 @@
#include "SAPI.h"
#include "rfc1867.h"
+#include "suhosin_globals.h"
+#endif
- #if HAVE_SYS_MMAN_H
- # include <sys/mman.h>
-@@ -487,7 +490,7 @@
+ #if HAVE_MMAP
+ # if HAVE_UNISTD_H
+@@ -504,7 +507,7 @@
STD_PHP_INI_ENTRY("extension_dir", PHP_EXTENSION_DIR, PHP_INI_SYSTEM, OnUpdateStringUnempty, extension_dir, php_core_globals, core_globals)
STD_PHP_INI_ENTRY("include_path", PHP_INCLUDE_PATH, PHP_INI_ALL, OnUpdateStringUnempty, include_path, php_core_globals, core_globals)
PHP_INI_ENTRY("max_execution_time", "30", PHP_INI_ALL, OnUpdateTimeout)
STD_PHP_INI_ENTRY("safe_mode_exec_dir", PHP_SAFE_MODE_EXEC_DIR, PHP_INI_SYSTEM, OnUpdateString, safe_mode_exec_dir, php_core_globals, core_globals)
STD_PHP_INI_BOOLEAN("file_uploads", "1", PHP_INI_SYSTEM, OnUpdateBool, file_uploads, php_core_globals, core_globals)
-@@ -1736,6 +1739,10 @@
+@@ -1810,6 +1813,10 @@
}
#endif
/* {{{ php_module_startup
*/
int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_modules, uint num_additional_modules)
-@@ -1780,6 +1787,10 @@
- tsrm_ls = ts_resource(0);
+@@ -1858,6 +1865,10 @@
+ php_win32_init_rng_lock();
#endif
+#if SUHOSIN_PATCH
module_shutdown = 0;
module_startup = 1;
sapi_initialize_empty_request(TSRMLS_C);
-@@ -1899,7 +1910,11 @@
+@@ -1980,7 +1991,11 @@
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);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_SHLIB_SUFFIX", PHP_SHLIB_SUFFIX, sizeof(PHP_SHLIB_SUFFIX)-1, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_STRINGL_CONSTANT("PHP_EOL", PHP_EOL, sizeof(PHP_EOL)-1, CONST_PERSISTENT | CONST_CS);
+ REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", LONG_MAX, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", sizeof(long), CONST_PERSISTENT | CONST_CS);
-
-diff -Nura php-5.3.1RC1/main/php.h suhosin-patch-5.3.1RC1-0.9.8/main/php.h
---- php-5.3.1RC1/main/php.h 2009-06-26 17:44:19.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/php.h 2009-09-27 19:04:06.000000000 +0200
-@@ -450,6 +450,10 @@
+ #ifdef ZEND_MULTIBYTE
+diff -Nura php-5.3.9/main/php.h suhosin-patch-5.3.9-0.9.10/main/php.h
+--- php-5.3.9/main/php.h 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/main/php.h 2012-01-11 19:29:07.000000000 +0100
+@@ -454,6 +454,10 @@
#endif
#endif /* !XtOffsetOf */
#endif
/*
-diff -Nura php-5.3.1RC1/main/php_config.h.in suhosin-patch-5.3.1RC1-0.9.8/main/php_config.h.in
---- php-5.3.1RC1/main/php_config.h.in 2009-09-04 01:11:30.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/php_config.h.in 2009-09-27 19:04:06.000000000 +0200
-@@ -833,6 +833,9 @@
- /* Define if the target system has /dev/urandom device */
- #undef HAVE_DEV_URANDOM
+diff -Nura php-5.3.9/main/php_config.h.in suhosin-patch-5.3.9-0.9.10/main/php_config.h.in
+--- php-5.3.9/main/php_config.h.in 2012-01-10 14:37:07.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/main/php_config.h.in 2012-01-11 19:29:07.000000000 +0100
+@@ -405,6 +405,9 @@
+ /* Define to 1 if you have the `alphasort' function. */
+ #undef HAVE_ALPHASORT
+/* Suhosin-Patch for PHP */
+#undef SUHOSIN_PATCH
/* Whether you have AOLserver */
#undef HAVE_AOLSERVER
-diff -Nura php-5.3.1RC1/main/php_logos.c suhosin-patch-5.3.1RC1-0.9.8/main/php_logos.c
---- php-5.3.1RC1/main/php_logos.c 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/php_logos.c 2009-09-27 19:04:06.000000000 +0200
+--- php-5.3.21/main/php_logos.c~ 2013-01-22 23:40:21.000000000 +0200
++++ php-5.3.21/main/php_logos.c 2013-01-22 23:41:14.071814355 +0200
@@ -50,6 +50,10 @@
return zend_hash_del(&phpinfo_logo_hash, logo_string, strlen(logo_string));
}
int php_init_info_logos(void)
{
if(zend_hash_init(&phpinfo_logo_hash, 0, NULL, NULL, 1)==FAILURE)
-@@ -63,6 +63,9 @@
- php_register_info_logo(PHP_EGG_LOGO_GUID, "image/gif", php_egg_logo, sizeof(php_egg_logo));
+@@ -64,6 +64,10 @@
php_register_info_logo(ZEND_LOGO_GUID , "image/gif", zend_logo , sizeof(zend_logo));
php_register_info_logo(PLD_LOGO_GUID , "image/png", pld_logo , sizeof(pld_logo));
+
+#if SUHOSIN_PATCH
-+ php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo , sizeof(suhosin_logo));
++ php_register_info_logo(SUHOSIN_LOGO_GUID, "image/jpeg", suhosin_logo , sizeof(suhosin_logo));
+#endif
-
++
return SUCCESS;
}
-diff -Nura php-5.3.1RC1/main/snprintf.c suhosin-patch-5.3.1RC1-0.9.8/main/snprintf.c
---- php-5.3.1RC1/main/snprintf.c 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/snprintf.c 2009-09-27 19:04:06.000000000 +0200
-@@ -1091,7 +1091,11 @@
+
+diff -Nura php-5.3.9/main/snprintf.c suhosin-patch-5.3.9-0.9.10/main/snprintf.c
+--- php-5.3.9/main/snprintf.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/main/snprintf.c 2012-01-11 19:29:07.000000000 +0100
+@@ -782,6 +782,10 @@
+ */
+ switch (*fmt) {
+ case 'Z':
++#if SUHOSIN_PATCH
++ zend_suhosin_log(S_MISC, "'Z' specifier within format string");
++ goto skip_output;
++#else
+ zvp = (zval*) va_arg(ap, zval*);
+ zend_make_printable_zval(zvp, &zcopy, &free_zcopy);
+ if (free_zcopy) {
+@@ -792,6 +796,7 @@
+ if (adjust_precision && precision < s_len) {
+ s_len = precision;
+ }
++#endif
+ break;
+ case 'u':
+ switch(modifier) {
+@@ -1093,7 +1098,11 @@
case 'n':
+#if SUHOSIN_PATCH
-+ zend_suhosin_log(S_MISC, "'n' specifier within format string");
++ zend_suhosin_log(S_MISC, "'n' specifier within format string");
+#else
*(va_arg(ap, int *)) = cc;
+#endif
goto skip_output;
/*
-diff -Nura php-5.3.1RC1/main/spprintf.c suhosin-patch-5.3.1RC1-0.9.8/main/spprintf.c
---- php-5.3.1RC1/main/spprintf.c 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/spprintf.c 2009-09-27 19:04:06.000000000 +0200
-@@ -698,7 +698,11 @@
+diff -Nura php-5.3.9/main/spprintf.c suhosin-patch-5.3.9-0.9.10/main/spprintf.c
+--- php-5.3.9/main/spprintf.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/main/spprintf.c 2012-01-11 19:29:08.000000000 +0100
+@@ -390,6 +390,10 @@
+ */
+ switch (*fmt) {
+ case 'Z':
++#if SUHOSIN_PATCH
++ zend_suhosin_log(S_MISC, "'Z' specifier within format string");
++ goto skip_output;
++#else
+ zvp = (zval*) va_arg(ap, zval*);
+ zend_make_printable_zval(zvp, &zcopy, &free_zcopy);
+ if (free_zcopy) {
+@@ -400,6 +404,7 @@
+ if (adjust_precision && precision < s_len) {
+ s_len = precision;
+ }
++#endif
+ break;
+ case 'u':
+ switch(modifier) {
+@@ -700,7 +705,11 @@
case 'n':
+#if SUHOSIN_PATCH
-+ zend_suhosin_log(S_MISC, "'n' specifier within format string");
++ zend_suhosin_log(S_MISC, "'n' specifier within format string");
+#else
*(va_arg(ap, int *)) = xbuf->len;
+#endif
goto skip_output;
/*
-diff -Nura php-5.3.1RC1/main/suhosin_globals.h suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_globals.h
---- php-5.3.1RC1/main/suhosin_globals.h 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_globals.h 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/main/suhosin_globals.h suhosin-patch-5.3.9-0.9.10/main/suhosin_globals.h
+--- php-5.3.9/main/suhosin_globals.h 1970-01-01 01:00:00.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/main/suhosin_globals.h 2012-01-11 19:29:08.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ +----------------------------------------------------------------------+
+ * c-basic-offset: 4
+ * End:
+ */
-diff -Nura php-5.3.1RC1/main/suhosin_logo.h suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_logo.h
---- php-5.3.1RC1/main/suhosin_logo.h 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_logo.h 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/main/suhosin_logo.h suhosin-patch-5.3.9-0.9.10/main/suhosin_logo.h
+--- php-5.3.9/main/suhosin_logo.h 1970-01-01 01:00:00.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/main/suhosin_logo.h 2012-01-11 19:29:08.000000000 +0100
@@ -0,0 +1,178 @@
+static unsigned char suhosin_logo[] =
+ "\xff\xd8\xff\xe0\x00\x10\x4a\x46\x49\x46\x00\x01\x01\x01\x00\x48"
+ "\x21\xb6\x99\x69\xbc\x25\xb6\xdb\x6d\x18\xc2\x10\xda\x12\x94\xa1"
+ "\x38\xc2\x53\x8c\x63\x18\xc7\x9d\xbe\x7f\xff\xd9"
+ ;
-diff -Nura php-5.3.1RC1/main/suhosin_patch.c suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.c
---- php-5.3.1RC1/main/suhosin_patch.c 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.c 2009-09-27 19:44:00.000000000 +0200
-@@ -0,0 +1,458 @@
+diff -Nura php-5.3.9/main/suhosin_patch.c suhosin-patch-5.3.9-0.9.10/main/suhosin_patch.c
+--- php-5.3.9/main/suhosin_patch.c 1970-01-01 01:00:00.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/main/suhosin_patch.c 2012-01-11 19:29:08.000000000 +0100
+@@ -0,0 +1,470 @@
+/*
+ +----------------------------------------------------------------------+
+ | Suhosin Patch for PHP |
+ +----------------------------------------------------------------------+
-+ | Copyright (c) 2004-2006 Stefan Esser |
++ | Copyright (c) 2004-2010 Stefan Esser |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 2.02 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | Author: Stefan Esser <sesser@hardened-php.net> |
+ +----------------------------------------------------------------------+
+ */
-+/* $Id$ */
++/* $Id: suhosin_patch.c,v 1.2 2004/11/21 09:38:52 ionic Exp $ */
+
+#include "php.h"
+
+#include <stdio.h>
+#include <stdlib.h>
++#include <sys/mman.h>
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
+struct _suhosin_patch_globals suhosin_patch_globals;
+#endif
+
-+/* hack that needs to be fixed */
-+#ifndef PAGE_SIZE
-+#define PAGE_SIZE 4096
-+#endif
++static char *suhosin_config = NULL;
+
-+#ifdef ZEND_WIN32
-+__declspec(align(PAGE_SIZE))
-+#endif
-+char suhosin_config[PAGE_SIZE]
-+#if defined(__GNUC__)
-+ __attribute__ ((aligned(PAGE_SIZE)))
-+#endif
-+;
++static zend_intptr_t SUHOSIN_POINTER_GUARD = 0;
+
+static void php_security_log(int loglevel, char *fmt, ...);
+
+ memset(suhosin_patch_globals, 0, sizeof(*suhosin_patch_globals));
+}
+
++ZEND_API char suhosin_get_config(int element)
++{
++ return ((char *)SUHOSIN_MANGLE_PTR(suhosin_config))[element];
++}
++
++static void suhosin_set_config(int element, char value)
++{
++ ((char *)SUHOSIN_MANGLE_PTR(suhosin_config))[element] = value;
++}
++
+static void suhosin_read_configuration_from_environment()
+{
+ char *tmp;
+ /* check if canary protection should be activated or not */
+ tmp = getenv("SUHOSIN_MM_USE_CANARY_PROTECTION");
+ /* default to activated */
-+ SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) = 1;
++ suhosin_set_config(SUHOSIN_MM_USE_CANARY_PROTECTION, 1);
+ if (tmp) {
+ int flag = zend_atoi(tmp, 0);
-+ SUHOSIN_CONFIG(SUHOSIN_MM_USE_CANARY_PROTECTION) = flag;
++ suhosin_set_config(SUHOSIN_MM_USE_CANARY_PROTECTION, flag);
+ }
+
+ /* check if free memory should be overwritten with 0xFF or not */
+ tmp = getenv("SUHOSIN_MM_DESTROY_FREE_MEMORY");
+ /* default to deactivated */
-+ SUHOSIN_CONFIG(SUHOSIN_MM_DESTROY_FREE_MEMORY) = 0;
++ suhosin_set_config(SUHOSIN_MM_DESTROY_FREE_MEMORY, 0);
+ if (tmp) {
+ int flag = zend_atoi(tmp, 0);
-+ SUHOSIN_CONFIG(SUHOSIN_MM_DESTROY_FREE_MEMORY) = flag;
++ suhosin_set_config(SUHOSIN_MM_DESTROY_FREE_MEMORY, flag);
+ }
+
+ /* check if canary violations should be ignored */
+ tmp = getenv("SUHOSIN_MM_IGNORE_CANARY_VIOLATION");
+ /* default to NOT ignore */
-+ SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) = 0;
++ suhosin_set_config(SUHOSIN_MM_IGNORE_CANARY_VIOLATION, 0);
+ if (tmp) {
+ int flag = zend_atoi(tmp, 0);
-+ SUHOSIN_CONFIG(SUHOSIN_MM_IGNORE_CANARY_VIOLATION) = flag;
++ suhosin_set_config(SUHOSIN_MM_IGNORE_CANARY_VIOLATION, flag);
+ }
+
+ /* check if invalid hashtable destructors should be ignored */
+ tmp = getenv("SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR");
+ /* default to NOT ignore */
-+ SUHOSIN_CONFIG(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR) = 0;
++ suhosin_set_config(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR, 0);
+ if (tmp) {
+ int flag = zend_atoi(tmp, 0);
-+ SUHOSIN_CONFIG(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR) = flag;
++ suhosin_set_config(SUHOSIN_HT_IGNORE_INVALID_DESTRUCTOR, flag);
+ }
+
+ /* check if invalid linkedlist destructors should be ignored */
+ tmp = getenv("SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR");
+ /* default to NOT ignore */
-+ SUHOSIN_CONFIG(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR) = 0;
++ suhosin_set_config(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR, 0);
+ if (tmp) {
+ int flag = zend_atoi(tmp, 0);
-+ SUHOSIN_CONFIG(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR) = flag;
++ suhosin_set_config(SUHOSIN_LL_IGNORE_INVALID_DESTRUCTOR, flag);
+ }
+
-+ SUHOSIN_CONFIG(SUHOSIN_CONFIG_SET) = 1;
++ suhosin_set_config(SUHOSIN_CONFIG_SET, 1);
+}
+
+static void suhosin_write_protect_configuration()
+{
-+#if defined(__GNUC__)
-+ mprotect(suhosin_config, PAGE_SIZE, PROT_READ);
-+#endif
++ /* check return value of mprotect() to ensure memory is read only now */
++ if (mprotect(SUHOSIN_MANGLE_PTR(suhosin_config), sysconf(_SC_PAGESIZE), PROT_READ) != 0) {
++ perror("suhosin");
++ _exit(1);
++ }
+}
+
+PHPAPI void suhosin_startup()
+#endif
+ zend_suhosin_log = php_security_log;
+
++ /* get the pointer guardian and ensure low 3 bits are 1 */
++ if (SUHOSIN_POINTER_GUARD == 0) {
++ zend_canary(&SUHOSIN_POINTER_GUARD, sizeof(SUHOSIN_POINTER_GUARD));
++ SUHOSIN_POINTER_GUARD |= 7;
++ }
++
++ if (!suhosin_config) {
++#ifndef MAP_ANONYMOUS
++#define MAP_ANONYMOUS MAP_ANON
++#endif
++ suhosin_config = mmap(NULL, sysconf(_SC_PAGESIZE), PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
++ if (suhosin_config == MAP_FAILED) {
++ perror("suhosin");
++ _exit(1);
++ }
++ suhosin_config = SUHOSIN_MANGLE_PTR(suhosin_config);
++ }
+ if (!SUHOSIN_CONFIG(SUHOSIN_CONFIG_SET)) {
+ suhosin_read_configuration_from_environment();
+ suhosin_write_protect_configuration();
+ }
+}
+
-+/*PHPAPI void suhosin_clear_mm_canaries(TSRMLS_D)
-+{
-+ zend_alloc_clear_mm_canaries(AG(heap));
-+ SPG(canary_1) = zend_canary();
-+ SPG(canary_2) = zend_canary();
-+ SPG(canary_3) = zend_canary();
-+}*/
-+
+static char *loglevel2string(int loglevel)
+{
+ switch (loglevel) {
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
-diff -Nura php-5.3.1RC1/main/suhosin_patch.h suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.h
---- php-5.3.1RC1/main/suhosin_patch.h 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.h 2009-09-27 19:40:08.000000000 +0200
-@@ -0,0 +1,63 @@
+diff -Nura php-5.3.9/main/suhosin_patch.h suhosin-patch-5.3.9-0.9.10/main/suhosin_patch.h
+--- php-5.3.9/main/suhosin_patch.h 1970-01-01 01:00:00.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/main/suhosin_patch.h 2012-01-11 19:29:08.000000000 +0100
+@@ -0,0 +1,59 @@
+/*
+ +----------------------------------------------------------------------+
+ | Suhosin Patch for PHP |
+ +----------------------------------------------------------------------+
-+ | Copyright (c) 2004-2009 Stefan Esser |
++ | Copyright (c) 2004-2010 Stefan Esser |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 2.02 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+
+#include "zend.h"
+
-+#define SUHOSIN_PATCH_VERSION "0.9.8"
++#define SUHOSIN_PATCH_VERSION "0.9.10"
+
+#define SUHOSIN_LOGO_GUID "SUHO8567F54-D428-14d2-A769-00DA302A5F18"
+
-+#define SUHOSIN_CONFIG(idx) suhosin_config[(idx)]
++#define SUHOSIN_CONFIG(idx) (suhosin_get_config(idx))
++
+#define SUHOSIN_MM_USE_CANARY_PROTECTION 0
+#define SUHOSIN_MM_DESTROY_FREE_MEMORY 1
+#define SUHOSIN_MM_IGNORE_CANARY_VIOLATION 2
+#include <mach/vm_param.h>
+#endif
+
-+/* hack that needs to be fixed */
-+#ifndef PAGE_SIZE
-+#define PAGE_SIZE 4096
-+#endif
-+
-+extern char suhosin_config[PAGE_SIZE];
++#define SUHOSIN_MANGLE_PTR(ptr) (ptr==NULL?NULL:((void *)((zend_intptr_t)(ptr)^SUHOSIN_POINTER_GUARD)))
+
+#endif
+
+ * c-basic-offset: 4
+ * End:
+ */
-diff -Nura php-5.3.1RC1/main/suhosin_patch.m4 suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.m4
---- php-5.3.1RC1/main/suhosin_patch.m4 1970-01-01 01:00:00.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/main/suhosin_patch.m4 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/main/suhosin_patch.m4 suhosin-patch-5.3.9-0.9.10/main/suhosin_patch.m4
+--- php-5.3.9/main/suhosin_patch.m4 1970-01-01 01:00:00.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/main/suhosin_patch.m4 2012-01-11 19:29:08.000000000 +0100
@@ -0,0 +1,8 @@
+dnl
-+dnl $Id$
++dnl $Id: suhosin_patch.m4,v 1.1 2004/11/14 13:24:24 ionic Exp $
+dnl
+dnl This file contains Suhosin Patch for PHP specific autoconf functions.
+dnl
+
+AC_DEFINE(SUHOSIN_PATCH, 1, [Suhosin Patch])
+
-diff -Nura php-5.3.1RC1/sapi/apache/mod_php5.c suhosin-patch-5.3.1RC1-0.9.8/sapi/apache/mod_php5.c
---- php-5.3.1RC1/sapi/apache/mod_php5.c 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/sapi/apache/mod_php5.c 2009-09-27 19:04:06.000000000 +0200
-@@ -967,7 +967,11 @@
+diff -Nura php-5.3.9/sapi/apache/mod_php5.c suhosin-patch-5.3.9-0.9.10/sapi/apache/mod_php5.c
+--- php-5.3.9/sapi/apache/mod_php5.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/sapi/apache/mod_php5.c 2012-01-11 19:29:08.000000000 +0100
+@@ -969,7 +969,11 @@
{
TSRMLS_FETCH();
if (PG(expose_php)) {
}
}
#endif
-diff -Nura php-5.3.1RC1/sapi/apache2filter/sapi_apache2.c suhosin-patch-5.3.1RC1-0.9.8/sapi/apache2filter/sapi_apache2.c
---- php-5.3.1RC1/sapi/apache2filter/sapi_apache2.c 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/sapi/apache2filter/sapi_apache2.c 2009-09-27 19:04:06.000000000 +0200
-@@ -581,7 +581,11 @@
+diff -Nura php-5.3.9/sapi/apache2filter/sapi_apache2.c suhosin-patch-5.3.9-0.9.10/sapi/apache2filter/sapi_apache2.c
+--- php-5.3.9/sapi/apache2filter/sapi_apache2.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/sapi/apache2filter/sapi_apache2.c 2012-01-11 19:29:08.000000000 +0100
+@@ -583,7 +583,11 @@
{
TSRMLS_FETCH();
if (PG(expose_php)) {
}
}
-diff -Nura php-5.3.1RC1/sapi/apache2handler/sapi_apache2.c suhosin-patch-5.3.1RC1-0.9.8/sapi/apache2handler/sapi_apache2.c
---- php-5.3.1RC1/sapi/apache2handler/sapi_apache2.c 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/sapi/apache2handler/sapi_apache2.c 2009-09-27 19:04:06.000000000 +0200
-@@ -386,7 +386,11 @@
+diff -Nura php-5.3.9/sapi/apache2handler/sapi_apache2.c suhosin-patch-5.3.9-0.9.10/sapi/apache2handler/sapi_apache2.c
+--- php-5.3.9/sapi/apache2handler/sapi_apache2.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/sapi/apache2handler/sapi_apache2.c 2012-01-11 19:29:08.000000000 +0100
+@@ -407,7 +407,11 @@
{
TSRMLS_FETCH();
if (PG(expose_php)) {
}
}
-diff -Nura php-5.3.1RC1/sapi/apache_hooks/mod_php5.c suhosin-patch-5.3.1RC1-0.9.8/sapi/apache_hooks/mod_php5.c
---- php-5.3.1RC1/sapi/apache_hooks/mod_php5.c 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/sapi/apache_hooks/mod_php5.c 2009-09-27 19:04:06.000000000 +0200
+diff -Nura php-5.3.9/sapi/apache_hooks/mod_php5.c suhosin-patch-5.3.9-0.9.10/sapi/apache_hooks/mod_php5.c
+--- php-5.3.9/sapi/apache_hooks/mod_php5.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/sapi/apache_hooks/mod_php5.c 2012-01-11 19:29:08.000000000 +0100
@@ -1256,7 +1256,11 @@
{
TSRMLS_FETCH();
}
}
#endif
-diff -Nura php-5.3.1RC1/sapi/cgi/cgi_main.c suhosin-patch-5.3.1RC1-0.9.8/sapi/cgi/cgi_main.c
---- php-5.3.1RC1/sapi/cgi/cgi_main.c 2009-06-22 16:10:40.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/sapi/cgi/cgi_main.c 2009-09-27 19:04:06.000000000 +0200
-@@ -1907,11 +1907,19 @@
+diff -Nura php-5.3.9/sapi/cgi/cgi_main.c suhosin-patch-5.3.9-0.9.10/sapi/cgi/cgi_main.c
+--- php-5.3.9/sapi/cgi/cgi_main.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/sapi/cgi/cgi_main.c 2012-01-11 19:36:52.000000000 +0100
+@@ -1932,11 +1932,19 @@
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
}
+#if SUHOSIN_PATCH
+#if ZEND_DEBUG
-+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+#else
-+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+#endif
+#else
#if ZEND_DEBUG
- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#else
- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#endif
+#endif
php_request_shutdown((void *) 0);
+ fcgi_shutdown();
exit_status = 0;
- goto out;
-diff -Nura php-5.3.1RC1/sapi/cli/php_cli.c suhosin-patch-5.3.1RC1-0.9.8/sapi/cli/php_cli.c
---- php-5.3.1RC1/sapi/cli/php_cli.c 2009-09-02 22:02:17.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/sapi/cli/php_cli.c 2009-09-27 19:04:06.000000000 +0200
-@@ -829,7 +829,11 @@
+diff -Nura php-5.3.9/sapi/cli/php_cli.c suhosin-patch-5.3.9-0.9.10/sapi/cli/php_cli.c
+--- php-5.3.9/sapi/cli/php_cli.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/sapi/cli/php_cli.c 2012-01-11 19:35:06.000000000 +0100
+@@ -826,7 +826,11 @@
}
request_started = 1;
-- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s",
+- php_printf("PHP %s (%s) (built: %s %s) %s\nCopyright (c) 1997-2013 The PHP Group\n%s",
+ php_printf("PHP %s "
+#if SUHOSIN_PATCH
-+ "with Suhosin-Patch "
++ "with Suhosin-Patch "
+#endif
-+ "(%s) (built: %s %s) %s\nCopyright (c) 1997-2009 The PHP Group\n%s",
++ "(%s) (built: %s %s) %s\nCopyright (c) 1997-2013 The PHP Group\n%s",
PHP_VERSION, sapi_module.name, __DATE__, __TIME__,
#if ZEND_DEBUG && defined(HAVE_GCOV)
"(DEBUG GCOV)",
-diff -Nura php-5.3.1RC1/sapi/litespeed/lsapi_main.c suhosin-patch-5.3.1RC1-0.9.8/sapi/litespeed/lsapi_main.c
---- php-5.3.1RC1/sapi/litespeed/lsapi_main.c 2008-08-27 00:05:17.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/sapi/litespeed/lsapi_main.c 2009-09-27 19:04:06.000000000 +0200
-@@ -545,11 +545,19 @@
- break;
- case 'v':
- if (php_request_startup(TSRMLS_C) != FAILURE) {
+diff -Nura php-5.3.9/sapi/litespeed/lsapi_main.c suhosin-patch-5.3.9-0.9.10/sapi/litespeed/lsapi_main.c
+--- php-5.3.9/sapi/litespeed/lsapi_main.c 2011-12-31 19:15:06.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/sapi/litespeed/lsapi_main.c 2012-01-11 19:29:08.000000000 +0100
+@@ -718,11 +718,19 @@
+ break;
+ case 'v':
+ if (php_request_startup(TSRMLS_C) != FAILURE) {
+#if SUHOSIN_PATCH
-+#if ZEND_DEBUG
-+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+#else
-+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
-+#endif
-+#else
++ #if ZEND_DEBUG
++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++ #else
++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++ #endif
++#else
#if ZEND_DEBUG
- php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built: %s %s) (DEBUG)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#else
- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2004 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
#endif
+#endif
#ifdef PHP_OUTPUT_NEWAPI
php_output_end_all(TSRMLS_C);
#else
-diff -Nura php-5.3.1RC1/sapi/milter/php_milter.c suhosin-patch-5.3.1RC1-0.9.8/sapi/milter/php_milter.c
---- php-5.3.1RC1/sapi/milter/php_milter.c 2008-12-31 12:15:49.000000000 +0100
-+++ suhosin-patch-5.3.1RC1-0.9.8/sapi/milter/php_milter.c 2009-09-27 19:04:06.000000000 +0200
-@@ -1102,7 +1102,11 @@
+diff -Nura php-5.3.9/sapi/milter/php_milter.c suhosin-patch-5.3.9-0.9.10/sapi/milter/php_milter.c
+--- php-5.3.9/sapi/milter/php_milter.c 2012-01-01 14:15:04.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/sapi/milter/php_milter.c 2012-01-11 19:33:42.000000000 +0100
+@@ -1111,7 +1111,11 @@
}
SG(headers_sent) = 1;
SG(request_info).no_headers = 1;
+#if SUHOSIN_PATCH
-+ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
++ php_printf("PHP %s with Suhosin-Patch (%s) (built: %s %s)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+#else
- php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2009 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+ php_printf("PHP %s (%s) (built: %s %s)\nCopyright (c) 1997-2013 The PHP Group\n%s", PHP_VERSION, sapi_module.name, __DATE__, __TIME__, get_zend_version());
+#endif
php_end_ob_buffers(1 TSRMLS_CC);
exit(1);
break;
-diff -Nura php-5.3.1RC1/win32/build/config.w32 suhosin-patch-5.3.1RC1-0.9.8/win32/build/config.w32
---- php-5.3.1RC1/win32/build/config.w32 2009-08-24 16:18:19.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/win32/build/config.w32 2009-09-27 19:04:06.000000000 +0200
-@@ -323,7 +323,7 @@
+diff -Nura php-5.3.9/win32/build/config.w32 suhosin-patch-5.3.9-0.9.10/win32/build/config.w32
+--- php-5.3.9/win32/build/config.w32 2011-03-28 12:55:34.000000000 +0200
++++ suhosin-patch-5.3.9-0.9.10/win32/build/config.w32 2012-01-11 19:29:08.000000000 +0100
+@@ -328,7 +328,7 @@
zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
zend_object_handlers.c zend_objects_API.c \
zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \
if (VCVERS == 1200) {
AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
-@@ -378,6 +378,7 @@
+@@ -385,6 +385,7 @@
AC_DEFINE('HAVE_USLEEP', 1);
AC_DEFINE('HAVE_STRCOLL', 1);
/* For snapshot builders, where can we find the additional
* files that make up the snapshot template? */
-diff -Nura php-5.3.1RC1/win32/build/config.w32.h.in suhosin-patch-5.3.1RC1-0.9.8/win32/build/config.w32.h.in
---- php-5.3.1RC1/win32/build/config.w32.h.in 2009-06-23 08:56:45.000000000 +0200
-+++ suhosin-patch-5.3.1RC1-0.9.8/win32/build/config.w32.h.in 2009-09-27 19:04:06.000000000 +0200
-@@ -149,6 +149,9 @@
+diff -Nura php-5.3.9/win32/build/config.w32.h.in suhosin-patch-5.3.9-0.9.10/win32/build/config.w32.h.in
+--- php-5.3.9/win32/build/config.w32.h.in 2010-11-26 19:25:13.000000000 +0100
++++ suhosin-patch-5.3.9-0.9.10/win32/build/config.w32.h.in 2012-01-11 19:29:08.000000000 +0100
+@@ -152,6 +152,9 @@
/* Win32 supports strcoll */
#define HAVE_STRCOLL 1
projects / packages / php.git / blobdiff