com php-src: Fixed NULL pointer dereference in php_url_enco de_hash_ex: ext/standard/http.c
| From: | Dmitry Stogov | Date: | Mon, 24 Feb 2014 08:07:02 +0000 |
| Subject: | com php-src: Fixed NULL pointer dereference in php_url_enco de_hash_ex: ext/standard/http.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77971@lists.php.net to get a copy of this message | ||
Commit: 4dac68221ff731717c5223bbb748400d12f40953
Author: Xinchen Hui <laruence@gmail.com> Mon, 24 Feb 2014 16:07:02 +0800
Parents: 94e30a8197ff8992b631920aec8b7a3430a91a71
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4dac68221ff731717c5223bbb748400d12f40953
Log:
Fixed NULL pointer dereference in php_url_encode_hash_ex
Changed paths:
M ext/standard/http.c
Diff:
diff --git a/ext/standard/http.c b/ext/standard/http.c
index cceaa48..4263a5f 100644
--- a/ext/standard/http.c
+++ b/ext/standard/http.c
@@ -59,18 +59,23 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
zend_hash_move_forward(ht)
) {
/* handling for private & protected object properties */
- prop_name = key->val;
- prop_len = key->len;
- if (key && key->val[0] == '\0' && type != NULL) {
- const char *tmp, *prop_name;
- int prop_len;
-
- zend_object *zobj = Z_OBJ_P(type);
- if (zend_check_property_access(zobj, key TSRMLS_CC) != SUCCESS) {
- /* private or protected property access outside of the class */
- continue;
+ if (key) {
+ if (key->val[0] == '\0' && type != NULL) {
+ const char *tmp;
+
+ zend_object *zobj = Z_OBJ_P(type);
+ if (zend_check_property_access(zobj, key TSRMLS_CC) != SUCCESS) {
+ /* private or protected property access outside of the class */
+ continue;
+ }
+ zend_unmangle_property_name_ex(key->val, key->len, &tmp, &prop_name,
&prop_len);
+ } else {
+ prop_name = key->val;
+ prop_len = key->len;
}
- zend_unmangle_property_name_ex(key->val, key->len, &tmp, &prop_name,
&prop_len);
+ } else {
+ prop_name = NULL;
+ prop_len = 0;
}
if ((zdata = zend_hash_get_current_data_ex(ht, NULL)) == NULL) {