diff options
| author | Dmitry Stogov <dmitry@php.net> | 2011-12-28 09:59:39 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2011-12-28 09:59:39 +0000 |
| commit | a68e858d6908f8dc3f88a409d4a9740330ad219f (patch) | |
| tree | 5e9b5360f5418dd732e283260d202895ef1e725f | |
| parent | 39a973a0c516a12ce6cbf84955421b450f6b7b1c (diff) | |
| download | php-git-a68e858d6908f8dc3f88a409d4a9740330ad219f.tar.gz | |
Fixed bug #60613 (Segmentation fault with $cls->{expr}() syntax)
| -rw-r--r-- | Zend/tests/bug60613.phpt | 19 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 3 |
2 files changed, 21 insertions, 1 deletions
diff --git a/Zend/tests/bug60613.phpt b/Zend/tests/bug60613.phpt new file mode 100644 index 0000000000..91b5369d3f --- /dev/null +++ b/Zend/tests/bug60613.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #60613 (Segmentation fault with $cls->{expr}() syntax) +--FILE-- +<?php +class Cls { + function __call($name, $arg) { + } +} + +$cls = new Cls(); +$cls->{0}(); +$cls->{1.0}(); +$cls->{true}(); +$cls->{false}(); +$cls->{null}(); +echo "ok\n"; +--EXPECT-- +ok + diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index c4e9291065..85d17f0d91 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -89,7 +89,8 @@ } while (0) #define FREE_POLYMORPHIC_CACHE_SLOT(literal) do { \ - if (CG(active_op_array)->literals[literal].cache_slot == \ + if (CG(active_op_array)->literals[literal].cache_slot != -1 && \ + CG(active_op_array)->literals[literal].cache_slot == \ CG(active_op_array)->last_cache_slot - POLYMORPHIC_CACHE_SLOT_SIZE) { \ CG(active_op_array)->literals[literal].cache_slot = -1; \ CG(active_op_array)->last_cache_slot -= POLYMORPHIC_CACHE_SLOT_SIZE; \ |