From: Michael Wallner <mike@php.net>
Date: Wed, 22 Jul 2009 09:28:10 +0000 (+0000)
Subject: fix bug #16700
X-Git-Tag: RELEASE_1_7_0b2~24
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=579d5cc7fc3c61a9ff07691653b9a28955331cb2;p=m6w6%2Fext-http

fix bug #16700
---

diff --git a/http_message_object.c b/http_message_object.c
index 70bf7f0..121337b 100644
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -149,6 +149,8 @@ HTTP_EMPTY_ARGS(reverse);
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC);
 #define http_message_object_write_prop _http_message_object_write_prop
 static void _http_message_object_write_prop(zval *object, zval *member, zval *value TSRMLS_DC);
+#define http_message_object_get_prop_ptr _http_message_object_get_prop_ptr
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC);
 #define http_message_object_get_props _http_message_object_get_props
 static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC);
 
@@ -228,7 +230,7 @@ PHP_MINIT_FUNCTION(http_message_object)
 	http_message_object_handlers.read_property = http_message_object_read_prop;
 	http_message_object_handlers.write_property = http_message_object_write_prop;
 	http_message_object_handlers.get_properties = http_message_object_get_props;
-	http_message_object_handlers.get_property_ptr_ptr = NULL;
+	http_message_object_handlers.get_property_ptr_ptr = http_message_object_get_prop_ptr;
 	
 	zend_declare_property_long(THIS_CE, ZEND_STRS("type")-1, HTTP_MSG_NONE, ZEND_ACC_PROTECTED TSRMLS_CC);
 	zend_declare_property_string(THIS_CE, ZEND_STRS("body")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC);
@@ -412,6 +414,17 @@ void _http_message_object_free(zend_object *object TSRMLS_DC)
 	freeObject(o);
 }
 
+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member TSRMLS_DC) {
+	getObjectEx(http_message_object, obj, object);
+	zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
+	
+	if (!pinfo || pinfo->ce != http_message_object_ce) {
+		return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member TSRMLS_CC);
+	}
+	zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index");
+	return NULL;
+}
+
 static zval *_http_message_object_read_prop(zval *object, zval *member, int type TSRMLS_DC)
 {
 	getObjectEx(http_message_object, obj, object);
@@ -422,7 +435,7 @@ static zval *_http_message_object_read_prop(zval *object, zval *member, int type
 #else
 	zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
 	
-	if (!pinfo) {
+	if (!pinfo || pinfo->ce != http_message_object_ce) {
 		return zend_get_std_object_handlers()->read_property(object, member, type TSRMLS_CC);
 	}
 #endif
@@ -532,7 +545,7 @@ static void _http_message_object_write_prop(zval *object, zval *member, zval *va
 #else
 	zend_property_info *pinfo = zend_get_property_info(obj->zo.ce, member, 1 TSRMLS_CC);
 	
-	if (!pinfo) {
+	if (!pinfo || pinfo->ce != http_message_object_ce) {
 		zend_get_std_object_handlers()->write_property(object, member, value TSRMLS_CC);
 		return;
 	}
diff --git a/tests/HttpMessage_009_bug16700.phpt b/tests/HttpMessage_009_bug16700.phpt
new file mode 100644
index 0000000..4c25eb7
--- /dev/null
+++ b/tests/HttpMessage_009_bug16700.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Bug #16700 - child classes of HttpMessage cannot not have array properties
+--SKIPIF--
+<?php
+include 'skip.inc';
+checkver(5);
+?>
+--FILE--
+<?php
+echo "-TEST\n";
+
+class ChildMessage extends HttpMessage {
+    public $properties = array();
+}
+
+$child = new ChildMessage;
+$child->properties['foo'] = 'bar';
+echo $child->properties['foo'], "\n";
+echo "Done\n";
+?>
+--EXPECTF--
+%aTEST
+bar
+Done