com php-src: fix #50: phpdbg_opcode.c
| From: | Bob Weinand | Date: | Thu, 16 Jan 2014 20:10:30 +0000 |
| Subject: | com php-src: fix #50: phpdbg_opcode.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75673@lists.php.net to get a copy of this message | ||
Commit: 837bd24dea5c32dc186a1fe484c2c276e97e92e1
Author: krakjoe <joe.watkins@live.co.uk> Thu, 16 Jan 2014 20:10:30 +0000
Parents: 231a1c401bf91aa154585cbc465a6902e90bddb4
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=837bd24dea5c32dc186a1fe484c2c276e97e92e1
Log:
fix #50
Bugs:
https://bugs.php..net/50
Changed paths:
M phpdbg_opcode.c
Diff:
diff --git a/phpdbg_opcode.c b/phpdbg_opcode.c
index 025d57a..8119158 100644
--- a/phpdbg_opcode.c
+++ b/phpdbg_opcode.c
@@ -52,13 +52,15 @@ static inline char *phpdbg_decode_op(zend_op_array *ops, znode_op *op, zend_uint
case IS_VAR:
case IS_TMP_VAR: {
zend_ulong id = 0, *pid = NULL;
- if (zend_hash_index_find(vars, (zend_ulong) ops->vars - op->var, (void**) &pid) !=
SUCCESS) {
- id = zend_hash_num_elements(vars);
- zend_hash_index_update(
- vars, (zend_ulong) ops->vars - op->var,
- (void**) &id,
- sizeof(zend_ulong), NULL);
- } else id = *pid;
+ if (vars != NULL) {
+ if (zend_hash_index_find(vars, (zend_ulong) ops->vars - op->var, (void**) &pid) !=
SUCCESS) {
+ id = zend_hash_num_elements(vars);
+ zend_hash_index_update(
+ vars, (zend_ulong) ops->vars - op->var,
+ (void**) &id,
+ sizeof(zend_ulong), NULL);
+ } else id = *pid;
+ }
asprintf(&decode, "@%lu", id);
} break;