com php-src: Fixed bug #69198 (Compact function generate array with length but no content): Zend/zend_hash.h ext/standard/tests/arra y/bug69198.phpt
| From: | Xinchen Hui | Date: | Sat, 07 Mar 2015 08:49:07 +0000 |
| Subject: | com php-src: Fixed bug #69198 (Compact function generate array with length but no content): Zend/zend_hash.h ext/standard/tests/arra y/bug69198.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85302@lists.php.net to get a copy of this message | ||
Commit: 28b408a242f66976adf736651ea559340ffc5483
Author: Xinchen Hui <laruence@php.net> Sat, 7 Mar 2015 16:49:07 +0800
Parents: f1d1273f2b580d5328497f7d59e5c25e6259354e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=28b408a242f66976adf736651ea559340ffc5483
Log:
Fixed bug #69198 (Compact function generate array with length but no content)
Bugs:
https://bugs.php.net/69198
Changed paths:
M Zend/zend_hash.h
A ext/standard/tests/array/bug69198.phpt
Diff:
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index 1a9d613..1e166ac 100644
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -279,7 +279,8 @@ static zend_always_inline zval *zend_hash_find_ind(const HashTable *ht, zend_str
zval *zv;
zv = zend_hash_find(ht, key);
- return (zv && Z_TYPE_P(zv) == IS_INDIRECT) ? Z_INDIRECT_P(zv) : zv;
+ return (zv && Z_TYPE_P(zv) == IS_INDIRECT) ?
+ ((Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF) ? Z_INDIRECT_P(zv) : NULL) : zv;
}
@@ -298,7 +299,8 @@ static zend_always_inline zval *zend_hash_str_find_ind(const HashTable *ht, cons
zval *zv;
zv = zend_hash_str_find(ht, str, len);
- return (zv && Z_TYPE_P(zv) == IS_INDIRECT) ? Z_INDIRECT_P(zv) : zv;
+ return (zv && Z_TYPE_P(zv) == IS_INDIRECT) ?
+ ((Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF) ? Z_INDIRECT_P(zv) : NULL) : zv;
}
diff --git a/ext/standard/tests/array/bug69198.phpt b/ext/standard/tests/array/bug69198..phpt
new file mode 100644
index 0000000..3faa5aa
--- /dev/null
+++ b/ext/standard/tests/array/bug69198.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #69198 (Compact function generate array with length but no content)
+--FILE--
+<?php
+if (false) {
+ $willNeverBeDefined = true;
+}
+$result = compact('willNeverBeDefined');
+var_dump($result, empty($result), $result === array(), empty($willNeverBeDefined));
+--EXPECT--
+array(0) {
+}
+bool(true)
+bool(true)
+bool(true)