[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_execute_API.c trunk/Zend/zend_execute_API.c
derick Sun, 29 Jan 2012 15:25:40 +
Revision: http://svn.php.net/viewvc?view=revision&revision=322922
Log:
- Reinstated correct return values after David's fix for #60218.
Bug: https://bugs.php.net/60218 (Closed) instantiating unknown class leads to
memory leak in cli
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
U php/php-src/trunk/Zend/zend_execute_API.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2012-01-29
11:17:07 UTC (rev 322921)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2012-01-29
15:25:40 UTC (rev 322922)
@@ -1195,8 +1195,11 @@
}
CG(interactive) = 0;
+ retval = SUCCESS;
zend_try {
- zend_execute(new_op_array TSRMLS_CC);
+ zend_execute(new_op_array TSRMLS_CC);
+ } zend_catch {
+ retval = FAILURE;
} zend_end_try();
CG(interactive) = orig_interactive;
@@ -1218,7 +1221,6 @@
destroy_op_array(new_op_array TSRMLS_CC);
efree(new_op_array);
EG(return_value_ptr_ptr) = original_return_value_ptr_ptr;
- retval = SUCCESS;
} else {
retval = FAILURE;
}
Modified: php/php-src/trunk/Zend/zend_execute_API.c
===
--- php/php-src/trunk/Zend/zend_execute_API.c 2012-01-29 11:17:07 UTC (rev
322921)
+++ php/php-src/trunk/Zend/zend_execute_API.c 2012-01-29 15:25:40 UTC (rev
322922)
@@ -1195,8 +1195,11 @@
}
CG(interactive) = 0;
+ retval = SUCCESS;
zend_try {
zend_execute(new_op_array TSRMLS_CC);
+ } zend_catch {
+ retval = FAILURE;
} zend_end_try();
CG(interactive) = orig_interactive;
@@ -1218,7 +1221,6 @@
destroy_op_array(new_op_array TSRMLS_CC);
efree(new_op_array);
EG(return_value_ptr_ptr) = original_return_value_ptr_ptr;
- retval = SUCCESS;
} else {
retval = FAILURE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_execute_API.c trunk/Zend/zend_execute_API.c
dsp Sat, 12 Nov 2011 17:05:08 +
Revision: http://svn.php.net/viewvc?view=revision&revision=319102
Log:
Fix #60218 (instantiating unknown class leads to memory leak in cli)
Bug: https://bugs.php.net/60218 (error getting bug information)
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
U php/php-src/trunk/Zend/zend_execute_API.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-11-12
16:32:10 UTC (rev 319101)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-11-12
17:05:08 UTC (rev 319102)
@@ -1195,7 +1195,9 @@
}
CG(interactive) = 0;
- zend_execute(new_op_array TSRMLS_CC);
+ zend_try {
+ zend_execute(new_op_array TSRMLS_CC);
+ } zend_end_try();
CG(interactive) = orig_interactive;
if (local_retval_ptr) {
Modified: php/php-src/trunk/Zend/zend_execute_API.c
===
--- php/php-src/trunk/Zend/zend_execute_API.c 2011-11-12 16:32:10 UTC (rev
319101)
+++ php/php-src/trunk/Zend/zend_execute_API.c 2011-11-12 17:05:08 UTC (rev
319102)
@@ -1195,7 +1195,9 @@
}
CG(interactive) = 0;
- zend_execute(new_op_array TSRMLS_CC);
+ zend_try {
+ zend_execute(new_op_array TSRMLS_CC);
+ } zend_end_try();
CG(interactive) = orig_interactive;
if (local_retval_ptr) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_execute_API.c trunk/Zend/zend_execute_API.c
pajoye Thu, 08 Sep 2011 09:17:21 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316405
Log:
- fix build when no zend signal support
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
U php/php-src/trunk/Zend/zend_execute_API.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-09-08
05:59:38 UTC (rev 316404)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-09-08
09:17:21 UTC (rev 316405)
@@ -1328,6 +1328,7 @@
TSRMLS_FETCH();
if (zend_on_timeout) {
+#ifdef ZEND_SIGNALS
/*
We got here because we got a timeout signal, so we are in a
signal handler
at this point. However, we want to be able to timeout any
user-supplied
@@ -1335,6 +1336,7 @@
calling these
*/
SIGG(running) = 0;
+#endif
zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
}
Modified: php/php-src/trunk/Zend/zend_execute_API.c
===
--- php/php-src/trunk/Zend/zend_execute_API.c 2011-09-08 05:59:38 UTC (rev
316404)
+++ php/php-src/trunk/Zend/zend_execute_API.c 2011-09-08 09:17:21 UTC (rev
316405)
@@ -1328,6 +1328,7 @@
TSRMLS_FETCH();
if (zend_on_timeout) {
+#ifdef ZEND_SIGNALS
/*
We got here because we got a timeout signal, so we are in a
signal handler
at this point. However, we want to be able to timeout any
user-supplied
@@ -1335,6 +1336,7 @@
calling these
*/
SIGG(running) = 0;
+#endif
zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_execute_API.c trunk/Zend/zend_execute_API.c
rasmus Wed, 07 Sep 2011 18:48:17 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316382
Log:
Make timeouts work again for shutdown functions.
Fixes the faling lang/045 test
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
U php/php-src/trunk/Zend/zend_execute_API.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-09-07
18:47:22 UTC (rev 316381)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-09-07
18:48:17 UTC (rev 316382)
@@ -1328,6 +1328,13 @@
TSRMLS_FETCH();
if (zend_on_timeout) {
+ /*
+ We got here because we got a timeout signal, so we are in a
signal handler
+ at this point. However, we want to be able to timeout any
user-supplied
+ shutdown functions, so pretend we are not in a signal
handler while we are
+ calling these
+ */
+ SIGG(running) = 0;
zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
}
Modified: php/php-src/trunk/Zend/zend_execute_API.c
===
--- php/php-src/trunk/Zend/zend_execute_API.c 2011-09-07 18:47:22 UTC (rev
316381)
+++ php/php-src/trunk/Zend/zend_execute_API.c 2011-09-07 18:48:17 UTC (rev
316382)
@@ -1328,6 +1328,13 @@
TSRMLS_FETCH();
if (zend_on_timeout) {
+ /*
+ We got here because we got a timeout signal, so we are in a
signal handler
+ at this point. However, we want to be able to timeout any
user-supplied
+ shutdown functions, so pretend we are not in a signal
handler while we are
+ calling these
+ */
+ SIGG(running) = 0;
zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_execute_API.c trunk/Zend/zend_execute_API.c
rasmus Sun, 07 Aug 2011 00:50:46 +
Revision: http://svn.php.net/viewvc?view=revision&revision=314391
Log:
Since we have fci_cache = &fci_cache_local inside that block
and fci_cache is then later used outside the block, fci_cache_local
can't be block-scoped here
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
U php/php-src/trunk/Zend/zend_execute_API.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-08-07
00:36:26 UTC (rev 314390)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-08-07
00:50:46 UTC (rev 314391)
@@ -763,6 +763,7 @@
zend_class_entry *called_scope = NULL;
zval *current_this;
zend_execute_data execute_data;
+ zend_fcall_info_cache fci_cache_local;
*fci->retval_ptr_ptr = NULL;
@@ -797,7 +798,6 @@
}
if (!fci_cache || !fci_cache->initialized) {
- zend_fcall_info_cache fci_cache_local;
char *callable_name;
char *error = NULL;
Modified: php/php-src/trunk/Zend/zend_execute_API.c
===
--- php/php-src/trunk/Zend/zend_execute_API.c 2011-08-07 00:36:26 UTC (rev
314390)
+++ php/php-src/trunk/Zend/zend_execute_API.c 2011-08-07 00:50:46 UTC (rev
314391)
@@ -763,6 +763,7 @@
zend_class_entry *called_scope = NULL;
zval *current_this;
zend_execute_data execute_data;
+ zend_fcall_info_cache fci_cache_local;
*fci->retval_ptr_ptr = NULL;
@@ -797,7 +798,6 @@
}
if (!fci_cache || !fci_cache->initialized) {
- zend_fcall_info_cache fci_cache_local;
char *callable_name;
char *error = NULL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
