From d76d41b9829db70f7feed79a1fdc29b382c1f036 Mon Sep 17 00:00:00 2001
From: Joe Watkins <krakjoe@php.net>
Date: Wed, 29 Jul 2015 17:59:37 +0100
Subject: [PATCH] fix leak and memory error

---
 .../Backend/PHP7/templates/module.c.php          | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/lib/PHPCompiler/Backend/PHP7/templates/module.c.php b/lib/PHPCompiler/Backend/PHP7/templates/module.c.php
index dd68c34..bd932f6 100644
--- a/lib/PHPCompiler/Backend/PHP7/templates/module.c.php
+++ b/lib/PHPCompiler/Backend/PHP7/templates/module.c.php
@@ -145,20 +145,6 @@
 	return &intern->std;
 <?php
     echo "}\n\n";
-    echo "static inline void php_{$name}_{$entry['id']}_destroy(void *zobject) {\n";
-?>
-	php_<?php echo $name; ?>_<?php echo $entry['id']; ?>_t *pobj = (php_<?php echo $name; ?>_<?php echo $entry['id']; ?>_t*) zobject;
-	zend_objects_destroy_object(zobject);
-<?php
-    echo "}\n\n";
-
-    echo "static inline void php_{$name}_{$entry['id']}_free(void *zobject) {\n";
-?>
-	php_<?php echo $name; ?>_<?php echo $entry['id']; ?>_t *pobj = (php_<?php echo $name; ?>_<?php echo $entry['id']; ?>_t*) zobject;
-	zend_object_std_dtor(&pobj->std);
-	efree(pobj);
-<?php
-    echo "}\n\n";
 
     echo "static HashTable* php_{$name}_{$entry['id']}_debug_info(zval *object, int *is_temp) {\n";
 ?>
@@ -246,7 +232,7 @@
     echo "\tphp_{$name}_{$entry['id']}_handlers.read_property = php_{$name}_{$entry['id']}_read_property;\n";
     echo "\tphp_{$name}_{$entry['id']}_handlers.write_property = php_{$name}_{$entry['id']}_write_property;\n";
     echo "\tphp_{$name}_{$entry['id']}_handlers.get_debug_info = php_{$name}_{$entry['id']}_debug_info;\n";
-
+    echo "\tphp_{$name}_{$entry['id']}_handlers.offset = XtOffsetOf(php_{$name}_{$entry['id']}_t, std);\n";
     echo "\tzend_hash_init(&php_{$name}_{$entry['id']}_prop_handlers, 0, NULL, php_{$name}_{$entry['id']}_dtor_prop_handler, 1);\n";
     foreach ($entry['properties'] as $prop) {
         echo "\tphp_{$name}_{$entry['id']}_register_prop_handler(&php_{$name}_{$entry['id']}_prop_handlers, \"" . addslashes($prop['name']) . "\", php_{$name}_{$entry['id']}_{$prop['name']}_read, php_{$name}_{$entry['id']}_{$prop['name']}_write);\n";