clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow libxml DomNodes to remain persistent when requested by other extensions

Browse Source
This commit is contained in:
Sara Golemon 2007-01-08 20:01:23 +00:00
parent 7b069ebc00
commit 26e15947ba
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ext/libxml/libxml.c
View File

@ -947,7 +947,9 @@ int php_libxml_increment_doc_ref(php_libxml_node_object *object, xmlDocPtr docp
ret_refcount = object->document->refcount;
} else if (docp != NULL) {
ret_refcount = 1;
object->document = emalloc(sizeof(php_libxml_ref_obj));
object->document = pemalloc(sizeof(php_libxml_ref_obj), 0);
object->document->persistent = 0;
object->document->external_owner = 0;
object->document->ptr = docp;
object->document->refcount = ret_refcount;
object->document->doc_props = NULL;
@ -972,9 +974,23 @@ int php_libxml_decrement_doc_ref(php_libxml_node_object *object TSRMLS_DC) {
}
efree(object->document->doc_props);
}
efree(object->document);
pefree(object->document, object->document->persistent);
object->document = NULL;
}
} else if (ret_refcount == 1 && object->document->external_owner) {
/* PHP is done with this object, but someone else owns the DomNodes,
* Kill the non-persistent bits, but leave the persistable php_libxml_ref_obj around */
if (object->document->doc_props != NULL) {
if (object->document->doc_props->classmap) {
zend_hash_destroy(object->document->doc_props->classmap);
FREE_HASHTABLE(object->document->doc_props->classmap);
}
efree(object->document->doc_props);
object->document->doc_props = NULL;
}
/* Don't worry about the fact that this memory is left unfreed,
* Whoever else owns it has the pointer stored somewhere */
object->document = NULL;
}
}
return ret_refcount;

2
ext/libxml/php_libxml.h
View File

@ -58,6 +58,8 @@ typedef struct _php_libxml_ref_obj {
void *ptr;
int refcount;
libxml_doc_props *doc_props;
zend_bool persistent;
zend_bool external_owner;
} php_libxml_ref_obj;
typedef struct _php_libxml_node_ptr {