guard against uninitialized property write, too

[m6w6/ext-pq] / src / php_pq_object.c

diff --git a/src/php_pq_object.c b/src/php_pq_object.c
index 704737ff95b1fcc2fcb95fccbed9ea7834ed5155..77207ea82f35136f83f36603ed407b7652e143ee 100644 (file)
--- a/src/php_pq_object.c
+++ b/src/php_pq_object.c
@@ -111,23 +111,22 @@ zval *php_pq_object_read_prop(zval *object, zval *member, int type, const zend_l
 {
        php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
        php_pq_object_prophandler_t *handler;
-       zval *return_value;
+       zval *return_value = NULL;
 
        if (!obj->intern) {
-               zend_error(E_WARNING, "%s not initialized", ancestor(obj->zo.ce)->name);
-       } else if ((SUCCESS == zend_hash_find(obj->prophandler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) && handler->read) {
-               if (type == BP_VAR_R) {
-                       ALLOC_ZVAL(return_value);
-                       Z_SET_REFCOUNT_P(return_value, 0);
-                       Z_UNSET_ISREF_P(return_value);
-
-                       handler->read(object, obj, return_value TSRMLS_CC);
-               } else {
-                       zend_error(E_ERROR, "Cannot access %s properties by reference or array key/index", ancestor(obj->zo.ce)->name);
-                       return_value = NULL;
-               }
-       } else {
+               php_error(E_RECOVERABLE_ERROR, "%s not initialized", ancestor(obj->zo.ce)->name);
+               return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC);
+       } else if ((SUCCESS != zend_hash_find(obj->prophandler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) || !handler->read) {
+               return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC);
+       } else if (type != BP_VAR_R) {
+               php_error(E_WARNING, "Cannot access %s properties by reference or array key/index", ancestor(obj->zo.ce)->name);
                return_value = zend_get_std_object_handlers()->read_property(object, member, type, key TSRMLS_CC);
+       } else {
+               ALLOC_ZVAL(return_value);
+               Z_SET_REFCOUNT_P(return_value, 0);
+               Z_UNSET_ISREF_P(return_value);
+
+               handler->read(object, obj, return_value TSRMLS_CC);
        }
 
        return return_value;
@@ -138,7 +137,10 @@ void php_pq_object_write_prop(zval *object, zval *member, zval *value, const zen
        php_pq_object_t *obj = zend_object_store_get_object(object TSRMLS_CC);
        php_pq_object_prophandler_t *handler;
 
-       if (SUCCESS == zend_hash_find(obj->prophandler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) {
+       if (!obj->intern) {
+               php_error(E_RECOVERABLE_ERROR, "%s not initialized", ancestor(obj->zo.ce)->name);
+               zend_get_std_object_handlers()->write_property(object, member, value, key TSRMLS_CC);
+       } else if (SUCCESS == zend_hash_find(obj->prophandler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void *) &handler)) {
                if (handler->write) {
                        handler->write(object, obj, value TSRMLS_CC);
                }