Re: FW: [PHP-CVS] cvs: php4 /ext/domxml php_domxml.c

Hey Jospeh, yeah, bug fixes should go in, but is it really fixed with this, or is it going to give a memleak? Anyway, merge it to the branch. Derick On Fri, 8 Mar 2002, Joseph Tate wrote: > > > -----Original Message----- > From: Joseph Tate [mailto:jtate@mi-corporation.com] > Sent: Thursday, March 07, 2002 6:53 PM > To: php-cvs@lists.php.net > Subject: [PHP-CVS] cvs: php4 /ext/domxml php_domxml.c > > > jtate Thu Mar 7 18:52:57 2002 EDT > > Modified files: > /php4/ext/domxml php_domxml.c > Log: > Commented out a few lines that were causing a segfault in the unlink code. > This fixes bug #14522. I've tested that it does not cause a segfault > under > RH 7.2, and retains all functionality. I recommend that this patch be > considered for the PHP_4_2_0 tree as well, as having a function that core > dumps every time is a bad thing(TM). > > > Index: php4/ext/domxml/php_domxml.c > diff -u php4/ext/domxml/php_domxml.c:1.119 > php4/ext/domxml/php_domxml.c:1.120 > --- php4/ext/domxml/php_domxml.c:1.119 Thu Mar 7 11:34:13 2002 > +++ php4/ext/domxml/php_domxml.c Thu Mar 7 18:52:57 2002 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: php_domxml.c,v 1.119 2002/03/07 16:34:13 jtate Exp $ */ > +/* $Id: php_domxml.c,v 1.120 2002/03/07 23:52:57 jtate Exp $ */ > > /* TODO > * - Support Notation Nodes > @@ -1802,8 +1802,12 @@ > DOMXML_PARAM_NONE(nodep, id, le_domxmlnodep); > > xmlUnlinkNode(nodep); > - xmlFreeNode(nodep); > - zval_dtor(id); /* This is not enough because the children won't be > deleted */ > + /* This causes a Segmentation Fault for some reason. Removing > + it allows the user to re-add the node at some other time, in > + addition to fixing the segfault. Node will be freed at > + shutdown. */ > + /*xmlFreeNode(nodep); > + zval_dtor(id);*/ /* This is not enough because the children won't be > deleted */ > } > /* }}} */ > > > > > -- > 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 -----------------------------------------------------------------------