- fix write access of HttpMessage headers array in inherited context

[m6w6/ext-http] / php_http_std_defs.h

diff --git a/php_http_std_defs.h b/php_http_std_defs.h
index e6d76d77566e50ef09cfe5ba355de098a5492ef7..65c72c1f42ac2c8aa9078777295ee511284c5cbf 100644 (file)
--- a/php_http_std_defs.h
+++ b/php_http_std_defs.h
@@ -41,19 +41,6 @@ typedef int STATUS;
        if(target) efree(target); \
        target = source
 
-#define ZVAL_STRING_FREE(z, s, d) \
-       {\
-               zval *__tmp = (z); \
-               /*zval_ptr_dtor(&__tmp);*/ \
-               ZVAL_STRING(__tmp, (s), (d)); \
-       }
-#define ZVAL_STRINGL_FREE(z, s, l, d) \
-       {\
-               zval *__tmp = (z); \
-               /*zval_ptr_dtor(&__tmp);*/ \
-               ZVAL_STRINGL(__tmp, (s), (l), (d)); \
-       }
-
 /* return bool (v == SUCCESS) */
 #define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v))
 #define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v))
@@ -206,12 +193,16 @@ typedef int STATUS;
 
 #      define getObject(t, o) getObjectEx(t, o, getThis())
 #      define getObjectEx(t, o, v) t * o = ((t *) zend_object_store_get_object(v TSRMLS_CC))
-#      define OBJ_PROP(o) o->zo.properties
+#      define OBJ_PROP(o) (o)->zo.properties
 #      define DCL_STATIC_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
 #      define DCL_STATIC_PROP_Z(a, n, v) zend_declare_property(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
 #      define DCL_STATIC_PROP_N(a, n) zend_declare_property_null(ce, (#n), sizeof(#n), (ZEND_ACC_ ##a | ZEND_ACC_STATIC) TSRMLS_CC)
 #      define GET_STATIC_PROP_EX(ce, n) zend_std_get_static_property(ce, (#n), sizeof(#n), 0 TSRMLS_CC)
+#ifdef zend_update_class_constants
 #      define USE_STATIC_PROP_EX(ce) zend_update_class_constants(ce TSRMLS_CC)
+#else
+#      define USE_STATIC_PROP_EX(ce)
+#endif
 #      define SET_STATIC_PROP_EX(ce, n, v) \
        { \
                int refcount; \
@@ -220,9 +211,54 @@ typedef int STATUS;
  \
                refcount = (*__static)->refcount; \
                is_ref = (*__static)->is_ref; \
-               zval_dtor(*__static); \
+               switch (Z_TYPE_PP(__static)) \
+               { \
+                       case IS_BOOL: case IS_LONG: case IS_NULL: \
+                       break; \
+                       case IS_RESOURCE: \
+                               zend_list_delete(Z_LVAL_PP(__static)); \
+                       break; \
+                       case IS_STRING: case IS_CONSTANT: \
+                               free(Z_STRVAL_PP(__static)); \
+                       break; \
+                       case IS_OBJECT: \
+                               Z_OBJ_HT_PP(__static)->del_ref(*__static TSRMLS_CC); \
+                       break; \
+                       case IS_ARRAY: case IS_CONSTANT_ARRAY: \
+                               if (Z_ARRVAL_PP(__static) && Z_ARRVAL_PP(__static) != &EG(symbol_table)) { \
+                                       zend_hash_destroy(Z_ARRVAL_PP(__static)); \
+                                       free(Z_ARRVAL_PP(__static)); \
+                               } \
+                       break; \
+               } \
                **__static = *(v); \
-               zval_copy_ctor(*__static); \
+               switch (Z_TYPE_PP(__static)) \
+               { \
+                       case IS_BOOL: case IS_LONG: case IS_NULL: \
+                       break; \
+                       case IS_RESOURCE: \
+                               zend_list_addref(Z_LVAL_PP(__static)); \
+                       break; \
+                       case IS_STRING: case IS_CONSTANT: \
+                               Z_STRVAL_PP(__static) = (char *) zend_strndup(Z_STRVAL_PP(__static), Z_STRLEN_PP(__static)); \
+                       break; \
+                       case IS_OBJECT: \
+                       { \
+                               Z_OBJ_HT_PP(__static)->add_ref(*__static TSRMLS_CC); \
+                       } \
+                       break; \
+                       case IS_ARRAY: case IS_CONSTANT_ARRAY: \
+                       { \
+                               if (Z_ARRVAL_PP(__static) != &EG(symbol_table)) { \
+                                       zval *tmp; \
+                                       HashTable *old = Z_ARRVAL_PP(__static); \
+                                       Z_ARRVAL_PP(__static) = (HashTable *) malloc(sizeof(HashTable)); \
+                                       zend_hash_init(Z_ARRVAL_PP(__static), 0, NULL, ZVAL_PTR_DTOR, 0); \
+                                       zend_hash_copy(Z_ARRVAL_PP(__static), old, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); \
+                               } \
+                       } \
+                       break; \
+               } \
                (*__static)->refcount = refcount; \
                (*__static)->is_ref = is_ref; \
        }
@@ -232,6 +268,7 @@ typedef int STATUS;
                MAKE_STD_ZVAL(__tmp); \
                ZVAL_STRING(__tmp, (s), (d)); \
                SET_STATIC_PROP_EX(ce, n, __tmp); \
+               zval_dtor(__tmp); \
                efree(__tmp); \
        }
 #define SET_STATIC_PROP_STRINGL_EX(ce, n, s, l, d) \
@@ -240,6 +277,7 @@ typedef int STATUS;
                MAKE_STD_ZVAL(__tmp); \
                ZVAL_STRINGL(__tmp, (s), (l), (d)); \
                SET_STATIC_PROP_EX(ce, n, __tmp); \
+               zval_dtor(__tmp); \
                efree(__tmp); \
        }
 #      define DCL_PROP(a, t, n, v) zend_declare_property_ ##t(ce, (#n), sizeof(#n), (v), (ZEND_ACC_ ##a) TSRMLS_CC)