com php-src: Fixed iterator dtor: Zend/zend_vm_def.h Ze nd/zend_vm_execute.h
| From: | Dmitry Stogov | Date: | Thu, 20 Mar 2014 19:28:24 +0000 |
| Subject: | com php-src: Fixed iterator dtor: Zend/zend_vm_def.h Ze nd/zend_vm_execute.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77578@lists.php.net to get a copy of this message | ||
Commit: 6186bc6dff69e5ac97b2cc7af8906d5952e1f307
Author: Dmitry Stogov <dmitry@zend.com> Thu, 20 Mar 2014 23:28:24 +0400
Parents: 24b72415cb97a2c84b359f5c8302288bd7466423
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6186bc6dff69e5ac97b2cc7af8906d5952e1f307
Log:
Fixed iterator dtor
Changed paths:
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
Diff:
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index d98087a..ca6bdba 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -3346,7 +3346,8 @@ again:
}
ZEND_VM_C_LABEL(unpack_iter_dtor):
- iter->funcs->dtor(iter TSRMLS_CC);
+//??? iter->funcs->dtor(iter TSRMLS_CC);
+ zend_iterator_dtor(iter TSRMLS_CC);
break;
}
case IS_REFERENCE:
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index f8429bc..379fbcb 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -824,7 +824,8 @@ again:
}
unpack_iter_dtor:
- iter->funcs->dtor(iter TSRMLS_CC);
+//??? iter->funcs->dtor(iter TSRMLS_CC);
+ zend_iterator_dtor(iter TSRMLS_CC);
break;
}
case IS_REFERENCE: