Changeset 11

Timestamp:

06/12/09 11:13:50 (15 months ago)

Author:

sesser

Message:

Fixing problem cause by zend_bailout() on parse error

Location:

trunk

Files:

• bytekit.c (modified) (6 diffs)
• php_bytekit.h (modified) (1 diff)

trunk/bytekit.c

@@ -1668 +1668 @@
     HashTable *dependencies = NULL;
     long flags = 0;
+    zend_execute_data *orig_execute_data;
 
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|zz", &zfilename, &zerrors, &zoptions) == FAILURE) {
@@ -1719 +1720 @@
             zend_hash_get_current_data(dependencies, (void **)&zdependency) == SUCCESS;
             zend_hash_move_forward(dependencies)) {
-                
+            
+            orig_execute_data = EG(current_execute_data);
+            
             zend_try {
                 ops = compile_filename(ZEND_INCLUDE, *zdependency TSRMLS_CC);
@@ -1725 +1728 @@
                 ops = NULL;
             } zend_end_try();
+            
+            EG(current_execute_data) = orig_execute_data;
         
             /* in case of an error clean up and exit */
@@ -1747 +1752 @@
     dependencies_num_classes = zend_hash_num_elements(EG(class_table));
 
+    orig_execute_data = EG(current_execute_data);
+    
     zend_try {
         
@@ -1756 +1763 @@
         file_handle.opened_path = NULL;
         file_handle.handle.fp = NULL;
-                
+        
         ops = zend_compile_file(&file_handle, ZEND_INCLUDE TSRMLS_CC);
     
@@ -1764 +1771 @@
         ops = NULL;
     } zend_end_try();
+    
+    EG(current_execute_data) = orig_execute_data;
+    
     
     /* this is again not 100% thread-safe but better than nothing */

trunk/php_bytekit.h

@@ -22 +22 @@
 #define PHP_BYTEKIT_H
 
-#define BYTEKIT_VERSION "0.1.0"
+#define BYTEKIT_VERSION "0.1.1"
 
 #ifdef ZTS