Merge branch 'master' of https://github.com/krakjoe/phpdbg

diff --cc phpdbg_info.c
index 237d97c85323aa02491324f457daecd6b68180f4,06830cbaaa7c7163c7e28100eec3e129692616e9..8f6393e490caabf1d7567035a9c2ededc4a9b5c2
--- 1/phpdbg_info.c
--- 2/phpdbg_info.c
+++ b/phpdbg_info.c
@@@ -78,29 -78,27 +78,33 @@@ PHPDBG_INFO(vars) /* {{{ *
                }
                zend_hash_move_forward_ex(EG(active_symbol_table), &pos);
        }
-       
+ 
        phpdbg_notice("Variables: %d",
                zend_hash_num_elements(&vars));
--      phpdbg_writeln("Refs\tName");
++      phpdbg_writeln("Addr\t\tRefs\tName");
  
        for (zend_hash_internal_pointer_reset_ex(&vars, &pos);
                zend_hash_get_current_data_ex(&vars, (void**) &data, &pos) == SUCCESS;
                zend_hash_move_forward_ex(&vars, &pos)) {
                char *var;
-               
+ 
                zend_hash_get_current_key_ex(&vars, &var, NULL, NULL, 0, &pos);
-               
+ 
                if (*data) {
 -                      phpdbg_write(
 -                      "%d\t%s$%s\t\t",
 +                      phpdbg_writeln(
-                       "%d\t%s$%s",
++                      "%p\t%d\t%s$%s",
++                              *data,
                                Z_REFCOUNT_PP(data),
                                Z_ISREF_PP(data) ? "&" : "", var);
-                       phpdbg_write(
-                       "|-----> ");
 -
--                      zend_print_flat_zval_r(*data TSRMLS_CC);
++                      
++                      phpdbg_write("|---> ");
++                      if (Z_TYPE_PP(data) != IS_NULL) {
++                              zend_print_flat_zval_r(*data TSRMLS_CC);
++                      } else phpdbg_write("(null)");
 +                      phpdbg_writeln(EMPTY);
                } else {
--                      phpdbg_write("0\t$%s", var);
++                      phpdbg_write(
++                              "n/a\tn/a\t$%s", var);
                }
                phpdbg_writeln(EMPTY);
        }