Re: cvs: php4 /ext/domxml php_domxml.c

On Tue, 12 Mar 2002, Christian Stocker wrote: > chregu Tue Mar 12 06:15:04 2002 EDT > > Modified files: > /php4/ext/domxml php_domxml.c > Log: > forgot SEPARATE_ZVAL, produced segfaults. > segfaulted only in 4_2_0 (not in HEAD and 4_0_7, strange...) Please merge this into the branch. Derick > > > > Index: php4/ext/domxml/php_domxml.c > diff -u php4/ext/domxml/php_domxml.c:1.126 php4/ext/domxml/php_domxml.c:1.127 > --- php4/ext/domxml/php_domxml.c:1.126 Tue Mar 12 04:12:42 2002 > +++ php4/ext/domxml/php_domxml.c Tue Mar 12 06:15:03 2002 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: php_domxml.c,v 1.126 2002/03/12 09:12:42 mfischer Exp $ */ > +/* $Id: php_domxml.c,v 1.127 2002/03/12 11:15:03 chregu Exp $ */ > > /* TODO > * - Support Notation Nodes > @@ -2378,7 +2378,7 @@ > xmlXPathObjectPtr xpathobjp; > xmlNode *contextnodep; > int name_len; > - char *str,*name; > + char *str, *name; > > contextnode = NULL; > contextnodep = NULL; > @@ -2423,9 +2423,10 @@ > xmlNodePtr node = nodesetp->nodeTab[0]; > int retnode; > rv = php_domobject_new(node, &retnode TSRMLS_CC); > + SEPARATE_ZVAL(&rv); > } > else { > - /*return false array, if no nodes were found */ > + /*return false, if no nodes were found */ > RETURN_FALSE; > } > > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > ---------------------------------------------------------------------- PHP: Scripting the Web - derick@php.net All your branches are belong to me! SRM: Site Resource Manager - www.vl-srm.net -----------------------------------------------------------------------