Changeset 92

Timestamp:

05/10/05 20:46:29 (3 years ago)

Author:

zoeloelip

Message:

Final fix for the properties_info memleak/segfault, it uses a trick to steal the
pointer from the static destructor function in the zendengine. Thanks to hoesh for his
help!

Files:

• eaccelerator/trunk/eaccelerator.c (modified) (5 diffs)

eaccelerator/trunk/eaccelerator.c

@@ -115 +115 @@
-
-FILE *F_fp;
+
+/* pointer to the properties_info hashtable destructor */
+static dtor_func_t properties_info_dtor = NULL;
-
-/* saved original functions */
@@ -2391 +2394 @@
-}
-
-/* is equal to zend_destroy_property_info in zend_compile.c, this function is 
- * needed as destructor for the properties_info hashtable, but is declared 
- * static, so redefine it here. */
-static void destroy_property_info(zend_property_info *property_info) {
-  efree(property_info->name);
-}
-
-static zend_class_entry* restore_class_entry(zend_class_entry* to, eaccelerator_class_entry *from TSRMLS_DC)
-{
@@ -2536 +2532 @@
-  to->default_properties.pDestructor = ZVAL_PTR_DTOR;
-  restore_hash(&to->properties_info, &from->properties_info, (restore_bucket_t)restore_property_info TSRMLS_CC);
-(dtor_func_t) destroy_property_info
+properties_info_dtor
-  if (from->static_members != NULL) {
-    ALLOC_HASHTABLE(to->static_members);
@@ -3744 +3740 @@
-}
-
+/* This function creates a dummy class entry to steal the pointer to the 
+ * properties_info hashtable destructor because it's declared static */
+static dtor_func_t get_zend_destroy_property_info(TSRMLS_D) {
+  zend_class_entry dummy_class_entry;
+  dummy_class_entry.type = ZEND_USER_CLASS; 
+
+  zend_initialize_class_data(&dummy_class_entry, 1 TSRMLS_CC); 
+
+  dtor_func_t property_dtor = dummy_class_entry.properties_info.pDestructor;
+
+  zend_hash_destroy(&dummy_class_entry.default_properties);
+  zend_hash_destroy(&dummy_class_entry.properties_info);
+  zend_hash_destroy(dummy_class_entry.static_members);
+  zend_hash_destroy(&dummy_class_entry.function_table);
+  FREE_HASHTABLE(dummy_class_entry.static_members);
+  zend_hash_destroy(&dummy_class_entry.constants_table);
+  
+  return property_dtor;
+}
+
-PHP_MINIT_FUNCTION(eaccelerator) {
-  if (type == MODULE_PERSISTENT) {
@@ -3832 +3848 @@
-    register_eaccelerator_as_zend_extension();
-  }
+  
+  /* cache the properties_info destructor */
+  properties_info_dtor = get_zend_destroy_property_info(TSRMLS_C);
+  
-  return SUCCESS;
-}