com php/gtk-src: Well at least make the var_dump work and stop crashing: main/phpg_support.c

[email protected] (Elizabeth Marie Smith) Tue, 17 Jul 2012 15:41:23 +0000
Newsgroups php.gtk.cvs
Message-ID <[email protected]>
Commit:    8853964256ab57b1b7ee8e076b05fb968e21c998=0AAuthor:    Elizabeth =
M Smith <[email protected]>         Tue, 17 Jul 2012 11:41:23 -0400=
=0AParents:   84e3370df4e9e56a1a2e9ec632679c42ad593349=0ABranches:  master=
=0A=0ALink:       http://git.php.net/?p=3Dphp/gtk-src.git;a=3Dcommitdiff;h=
=3D8853964256ab57b1b7ee8e076b05fb968e21c998=0A=0ALog:=0AWell at least make =
the var_dump work and stop crashing=0A=0AChanged paths:=0A  M  main/phpg_su=
pport.c=0A=0A=0ADiff:=0Adiff --git a/main/phpg_support.c b/main/phpg_suppor=
t.c=0Aindex cee6364..d5064c6 100644=0A--- a/main/phpg_support.c=0A+++ b/mai=
n/phpg_support.c=0A@@ -177,19 +177,26 @@ HashTable* phpg_get_properties(zva=
l *object TSRMLS_DC)=0A =09int ret;=0A =0A =09poh =3D (phpg_head_t *) zend_=
object_store_get_object(object TSRMLS_CC);=0A-    pi_hash =3D poh->pi_hash;=
=0A-    for (zend_hash_internal_pointer_reset(pi_hash);=0A-         zend_ha=
sh_get_current_data(pi_hash, (void **)&pi) =3D=3D SUCCESS;=0A-         zend=
_hash_move_forward(pi_hash)) {=0A-=0A-        ret =3D pi->read(poh, &result=
 TSRMLS_CC);=0A-        if (ret =3D=3D SUCCESS) {=0A-            ALLOC_ZVAL=
(result_ptr);=0A-            *result_ptr =3D result;=0A-            INIT_PZ=
VAL(result_ptr);=0A-            zend_hash_update(poh->zobj.properties, (cha=
r *)pi->name, strlen(pi->name)+1, &result_ptr, sizeof(zval *), NULL);=0A-  =
      }=0A-    }=0A+=0A+=09if (!poh->zobj.properties) {=0A+=09=09rebuild_ob=
ject_properties(&poh->zobj);=0A+=09}=0A+=0A+=09if (poh->pi_hash) {=0A+=09=
=09pi_hash =3D poh->pi_hash;=0A+=09=09for (zend_hash_internal_pointer_reset=
(pi_hash);=0A+=09=09=09 zend_hash_get_current_data(pi_hash, (void **)&pi) =
=3D=3D SUCCESS;=0A+=09=09=09 zend_hash_move_forward(pi_hash)) {=0A+=09=0A+=
=09=09=09ret =3D pi->read(poh, &result TSRMLS_CC);=0A+=09=09=09if (ret =3D=
=3D SUCCESS) {=0A+=09=09=09=09ALLOC_ZVAL(result_ptr);=0A+=09=09=09=09*resul=
t_ptr =3D result;=0A+=09=09=09=09INIT_PZVAL(result_ptr);=0A+=09=09=09=09zen=
d_hash_update(poh->zobj.properties, (char *)pi->name, strlen(pi->name)+1, &=
result_ptr, sizeof(zval *), NULL);=0A+=09=09=09}=0A+=09=09}=0A+=09}=0A =0A =
=09return poh->zobj.properties;=0A }=0A