com php-src: Fixed build without alloca(): Zend/zend_object _handlers.c
| From: | Dmitry Stogov | Date: | Thu, 15 Jan 2015 18:43:17 +0000 |
| Subject: | com php-src: Fixed build without alloca(): Zend/zend_object _handlers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84122@lists.php.net to get a copy of this message | ||
Commit: 1c5e9146169cea55796749ff223e5670f2d509bd
Author: Dmitry Stogov <dmitry@zend.com> Thu, 15 Jan 2015 21:43:17 +0300
Parents: 12cbb9c156cfaef331f75076b8a3ef85797eacc2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1c5e9146169cea55796749ff223e5670f2d509bd
Log:
Fixed build without alloca()
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 796dd50..251ac31 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1035,7 +1035,9 @@ static union _zend_function *zend_std_get_method(zend_object **obj_ptr,
zend_str
if (EXPECTED(key != NULL)) {
lc_method_name = Z_STR_P(key);
+#ifdef ZEND_ALLOCA_MAX_SIZE
use_heap = 0;
+#endif
} else {
STR_ALLOCA_ALLOC(lc_method_name, method_name->len, use_heap);
zend_str_tolower_copy(lc_method_name->val, method_name->val, method_name->len);