Fixed bug #46074 (Bus error during running PHP CLI under IRIX 6.5.30)

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index a6abbba650725ddac27f4ae5ca5b08fd3ad164cf..6e94e81da6b367ef0744677bbfc0ea02b81b61a5 100644 (file)
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -512,20 +512,7 @@ static unsigned int _zend_mm_cookie = 0;
 /* optimized access */
 #define ZEND_MM_FREE_BLOCK_SIZE(b)             (b)->info._size
 
-#ifndef ZEND_MM_ALIGNMENT
-# define ZEND_MM_ALIGNMENT 8
-# define ZEND_MM_ALIGNMENT_LOG2 3
-#elif ZEND_MM_ALIGNMENT < 4
-# undef ZEND_MM_ALIGNMENT
-# undef ZEND_MM_ALIGNMENT_LOG2
-# define ZEND_MM_ALIGNMENT 4
-# define ZEND_MM_ALIGNMENT_LOG2 2
-#endif
-
-#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1)
-
 /* Aligned header size */
-#define ZEND_MM_ALIGNED_SIZE(size)                     ((size + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
 #define ZEND_MM_ALIGNED_HEADER_SIZE                    ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_block))
 #define ZEND_MM_ALIGNED_FREE_HEADER_SIZE       ZEND_MM_ALIGNED_SIZE(sizeof(zend_mm_small_free_block))
 #define ZEND_MM_MIN_ALLOC_BLOCK_SIZE           ZEND_MM_ALIGNED_SIZE(ZEND_MM_ALIGNED_HEADER_SIZE + END_MAGIC_SIZE)

diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 4462a80fb6693e6fad5211b17870633824994d96..48049cd650cd9f29c9ea9bd0b8bcab8fd34d861d 100644 (file)
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -27,6 +27,20 @@
 #include "../TSRM/TSRM.h"
 #include "zend.h"
 
+#ifndef ZEND_MM_ALIGNMENT
+# define ZEND_MM_ALIGNMENT 8
+# define ZEND_MM_ALIGNMENT_LOG2 3
+#elif ZEND_MM_ALIGNMENT < 4
+# undef ZEND_MM_ALIGNMENT
+# undef ZEND_MM_ALIGNMENT_LOG2
+# define ZEND_MM_ALIGNMENT 4
+# define ZEND_MM_ALIGNMENT_LOG2 2
+#endif
+
+#define ZEND_MM_ALIGNMENT_MASK ~(ZEND_MM_ALIGNMENT-1)
+
+#define ZEND_MM_ALIGNED_SIZE(size)     (((size) + ZEND_MM_ALIGNMENT - 1) & ZEND_MM_ALIGNMENT_MASK)
+
 typedef struct _zend_leak_info {
        void *addr;
        size_t size;

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index e3d44c2c8fbdf068ae6e749b66044e518769bd91..84eef66d9d0e0c9ea1aaa6992c1f5acf4acc2034 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -256,7 +256,7 @@ ZEND_API zend_bool zend_is_compiling(TSRMLS_D) /* {{{ */
 
 static zend_uint get_temporary_variable(zend_op_array *op_array) /* {{{ */
 {
-       return (op_array->T)++ * sizeof(temp_variable);
+       return (op_array->T)++ * ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable));
 }
 /* }}} */
 

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index d2ab0b8d3d6736ad6b47a3555921c6de000b73f1..d987de080db08350a999cb26c18ac28530721759 100644 (file)
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -144,9 +144,11 @@ struct _zend_vm_stack {
        void **top;
        void **end;
        zend_vm_stack prev;
-       void *elements[1];
 };
 
+#define ZEND_VM_STACK_ELEMETS(stack) \
+       ((void**)(((char*)(stack)) + ZEND_MM_ALIGNED_SIZE(sizeof(struct _zend_vm_stack))))
+
 #define ZEND_VM_STACK_GROW_IF_NEEDED(count)                                                    \
        do {                                                                                                                    \
                if (UNEXPECTED((count) >                                                                        \
@@ -156,10 +158,10 @@ struct _zend_vm_stack {
        } while (0)
 
 static inline zend_vm_stack zend_vm_stack_new_page(int count) {
-       zend_vm_stack page = (zend_vm_stack)emalloc(sizeof(*page)+sizeof(page->elements[0])*(count-1));
+       zend_vm_stack page = (zend_vm_stack)emalloc(ZEND_MM_ALIGNED_SIZE(sizeof(*page)) + sizeof(void*) * count);
 
-       page->top = page->elements;
-       page->end = page->elements + count;
+       page->top = ZEND_VM_STACK_ELEMETS(page);
+       page->end = page->top + count;
        page->prev = NULL;
        return page;
 }
@@ -207,7 +209,7 @@ static inline void *zend_vm_stack_pop(TSRMLS_D)
 {
        void *el = *(--EG(argument_stack)->top);
 
-       if (UNEXPECTED(EG(argument_stack)->top == EG(argument_stack)->elements)) {
+       if (UNEXPECTED(EG(argument_stack)->top == ZEND_VM_STACK_ELEMETS(EG(argument_stack)))) {
                zend_vm_stack p = EG(argument_stack);
                EG(argument_stack) = p->prev;
                efree(p);
@@ -221,15 +223,32 @@ static inline void *zend_vm_stack_alloc(size_t size TSRMLS_DC)
 
        size = (size + (sizeof(void*) - 1)) / sizeof(void*);
 
-       ZEND_VM_STACK_GROW_IF_NEEDED((int)size);
+       /* the following comparison must be optimized out at compile time */
+       if (ZEND_MM_ALIGNMENT > sizeof(void*)) {
+               int extra = (ZEND_MM_ALIGNMENT - ((zend_uintptr_t)EG(argument_stack)->top & (ZEND_MM_ALIGNMENT - 1))) / sizeof(void*);
+
+               if (UNEXPECTED(size + extra + ZEND_MM_ALIGNED_SIZE(sizeof(void*)) / sizeof(void*) >
+                   EG(argument_stack)->end - EG(argument_stack)->top)) {
+                       zend_vm_stack_extend(size TSRMLS_CC);
+               } else {
+                       void **old_top = EG(argument_stack)->top;
+
+                       EG(argument_stack)->top += extra;
+                       /* store old top on the stack */
+                       *EG(argument_stack)->top = (void*)old_top;
+                       EG(argument_stack)->top += ZEND_MM_ALIGNED_SIZE(sizeof(void*)) / sizeof(void*);
+               }
+       } else {
+               ZEND_VM_STACK_GROW_IF_NEEDED((int)size);
+       }
        ret = (void*)EG(argument_stack)->top;
        EG(argument_stack)->top += size;
        return ret;
 }
 
-static inline void zend_vm_stack_free(void *ptr TSRMLS_DC)
+static inline void zend_vm_stack_free_int(void *ptr TSRMLS_DC)
 {      
-       if (UNEXPECTED(EG(argument_stack)->elements == (void**)ptr)) {
+       if (UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == (void**)ptr)) {
                zend_vm_stack p = EG(argument_stack);
 
                EG(argument_stack) = p->prev;
@@ -239,10 +258,28 @@ static inline void zend_vm_stack_free(void *ptr TSRMLS_DC)
        }
 }
 
+static inline void zend_vm_stack_free(void *ptr TSRMLS_DC)
+{      
+       if (UNEXPECTED(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) == (void**)ptr)) {
+               zend_vm_stack p = EG(argument_stack);
+
+               EG(argument_stack) = p->prev;
+               efree(p);
+       } else {
+               /* the following comparison must be optimized out at compile time */
+               if (ZEND_MM_ALIGNMENT > sizeof(void*)) {
+                       ptr = (void*)(((char*)ptr) - ZEND_MM_ALIGNED_SIZE(sizeof(void*)));
+                       EG(argument_stack)->top = *(void***)ptr;
+               } else {
+                       EG(argument_stack)->top = (void**)ptr;
+               }
+       }
+}
+
 static inline void** zend_vm_stack_push_args(int count TSRMLS_DC)
 {
 
-       if (UNEXPECTED(EG(argument_stack)->top - EG(argument_stack)->elements < count)  || 
+       if (UNEXPECTED(EG(argument_stack)->top - ZEND_VM_STACK_ELEMETS(EG(argument_stack)) < count)  || 
                UNEXPECTED(EG(argument_stack)->top == EG(argument_stack)->end)) {
                zend_vm_stack p = EG(argument_stack);
 
@@ -253,14 +290,14 @@ static inline void** zend_vm_stack_push_args(int count TSRMLS_DC)
                while (count-- > 0) {
                        void *data = *(--p->top);
 
-                       if (UNEXPECTED(p->top == p->elements)) {
+                       if (UNEXPECTED(p->top == ZEND_VM_STACK_ELEMETS(p))) {
                                zend_vm_stack r = p;
 
                                EG(argument_stack)->prev = p->prev;
                                p = p->prev;
                                efree(r);
                        }
-                       *(EG(argument_stack)->elements + count) = data;
+                       *(ZEND_VM_STACK_ELEMETS(EG(argument_stack)) + count) = data;
                }
                return EG(argument_stack)->top++;
        }
@@ -278,7 +315,7 @@ static inline void zend_vm_stack_clear_multiple(TSRMLS_D)
                *p = NULL;
                zval_ptr_dtor(&q);
        }
-       zend_vm_stack_free(p TSRMLS_CC);
+       zend_vm_stack_free_int(p TSRMLS_CC);
 }
 
 static inline zval** zend_vm_stack_get_arg(int requested_arg TSRMLS_DC)

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 8790847a01a1cdc880411d8abe2639cb8e513c29..34ac30410200157e92a1dc7b0208ba7c41cecd9a 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4261,8 +4261,8 @@ ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
        int catched = 0;
        zval restored_error_reporting;
  
-       void **stack_frame = (void**)EX(Ts) +
-               (sizeof(temp_variable) * EX(op_array)->T) / sizeof(void*);
+       void **stack_frame = (void**)(((char*)EX(Ts)) +
+               (ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)) * EX(op_array)->T));
 
        while (zend_vm_stack_top(TSRMLS_C) != stack_frame) {
                zval *stack_zval_p = zend_vm_stack_pop(TSRMLS_C);

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index a73f351cd92590fbf3113f738f5a3ebd9eef2862..2b56493216d09b07d54b5e9811e3206b5e0b35b8 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -52,13 +52,13 @@ ZEND_API void execute(zend_op_array *op_array TSRMLS_DC)
 zend_vm_enter:
        /* Initialize execute_data */
        execute_data = (zend_execute_data *)zend_vm_stack_alloc(
-               sizeof(zend_execute_data) +
-               sizeof(zval**) * op_array->last_var * (EG(active_symbol_table) ? 1 : 2) +
-               sizeof(temp_variable) * op_array->T TSRMLS_CC);
+               ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data)) +
+               ZEND_MM_ALIGNED_SIZE(sizeof(zval**) * op_array->last_var * (EG(active_symbol_table) ? 1 : 2)) +
+               ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)) * op_array->T TSRMLS_CC);
 
-       EX(CVs) = (zval***)((char*)execute_data + sizeof(zend_execute_data));
+       EX(CVs) = (zval***)((char*)execute_data + ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data)));
        memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var);
-       EX(Ts) = (temp_variable *)(EX(CVs) + op_array->last_var * (EG(active_symbol_table) ? 1 : 2));
+       EX(Ts) = (temp_variable *)(((char*)EX(CVs)) + ZEND_MM_ALIGNED_SIZE(sizeof(zval**) * op_array->last_var * (EG(active_symbol_table) ? 1 : 2)));
        EX(fbc) = NULL;
        EX(called_scope) = NULL;
        EX(object) = NULL;
@@ -598,8 +598,8 @@ static int ZEND_FASTCALL  ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER
        int catched = 0;
        zval restored_error_reporting;
 
-       void **stack_frame = (void**)EX(Ts) +
-               (sizeof(temp_variable) * EX(op_array)->T) / sizeof(void*);
+       void **stack_frame = (void**)(((char*)EX(Ts)) +
+               (ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)) * EX(op_array)->T));
 
        while (zend_vm_stack_top(TSRMLS_C) != stack_frame) {
                zval *stack_zval_p = zend_vm_stack_pop(TSRMLS_C);

diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl
index 52592dac21d09bb16e5bac144a4adce28b06a155..18d0e293564d6645f9d756fe51650ec63e02ca53 100644 (file)
--- a/Zend/zend_vm_execute.skl
+++ b/Zend/zend_vm_execute.skl
@@ -18,13 +18,13 @@ ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC)
 zend_vm_enter:
        /* Initialize execute_data */
        execute_data = (zend_execute_data *)zend_vm_stack_alloc(
-               sizeof(zend_execute_data) +
-               sizeof(zval**) * op_array->last_var * (EG(active_symbol_table) ? 1 : 2) +
-               sizeof(temp_variable) * op_array->T TSRMLS_CC);
+               ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data)) +
+               ZEND_MM_ALIGNED_SIZE(sizeof(zval**) * op_array->last_var * (EG(active_symbol_table) ? 1 : 2)) +
+               ZEND_MM_ALIGNED_SIZE(sizeof(temp_variable)) * op_array->T TSRMLS_CC);
 
-       EX(CVs) = (zval***)((char*)execute_data + sizeof(zend_execute_data));
+       EX(CVs) = (zval***)((char*)execute_data + ZEND_MM_ALIGNED_SIZE(sizeof(zend_execute_data)));
        memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var);
-       EX(Ts) = (temp_variable *)(EX(CVs) + op_array->last_var * (EG(active_symbol_table) ? 1 : 2));
+       EX(Ts) = (temp_variable *)(((char*)EX(CVs)) + ZEND_MM_ALIGNED_SIZE(sizeof(zval**) * op_array->last_var * (EG(active_symbol_table) ? 1 : 2)));
        EX(fbc) = NULL;
        EX(called_scope) = NULL;
        EX(object) = NULL;