Merge pull request #77 from BitOne/GITHUB-76_children_items_not_linked

Fixes #76 on not maching children and item identifier

Author: BitOne

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.0.3 Ygramul (2018-08-13)
+ - [GITHUB-76](https://github.com/BitOne/php-meminfo/issues/76) Fixes wrong non matching item reference from children, introduced in v1.0.2
+
 # 1.0.2 Ygramul (2018-08-08)
 
 ## Bug fixes

extension/php7/meminfo.c

@@ -162,6 +162,21 @@ void meminfo_hash_dump(php_stream *stream, HashTable *ht, zend_bool is_object, H
 
     zend_hash_internal_pointer_reset_ex(ht, &pos);
     while (zval = zend_hash_get_current_data_ex(ht, &pos)) {
+        char zval_id[16];
+
+        if (Z_TYPE_P(zval) == IS_INDIRECT) {
+            zval = Z_INDIRECT_P(zval);
+        }
+
+        if (Z_ISREF_P(zval)) {
+            ZVAL_DEREF(zval);
+        }
+
+        if (Z_TYPE_P(zval) == IS_OBJECT) {
+            sprintf(zval_id, "%p", zval->value.obj);
+        } else {
+            sprintf(zval_id, "%p", zval);
+        }
 
         if (!first_child) {
             php_stream_printf(stream TSRMLS_CC, ",\n");
@@ -180,22 +195,22 @@ void meminfo_hash_dump(php_stream *stream, HashTable *ht, zend_bool is_object, H
 
                     escaped_property_name = meminfo_escape_for_json(property_name);
 
-                    php_stream_printf(stream TSRMLS_CC, "            \"%s\":\"%p\"", ZSTR_VAL(escaped_property_name), zval);
+                    php_stream_printf(stream TSRMLS_CC, "            \"%s\":\"%s\"", ZSTR_VAL(escaped_property_name), zval_id);
 
                     zend_string_release(escaped_property_name);
                 } else {
                     zend_string * escaped_key;
 
                     escaped_key = meminfo_escape_for_json(ZSTR_VAL(key));
 
-                    php_stream_printf(stream TSRMLS_CC, "            \"%s\":\"%p\"", ZSTR_VAL(escaped_key), zval);
+                    php_stream_printf(stream TSRMLS_CC, "            \"%s\":\"%s\"", ZSTR_VAL(escaped_key), zval_id);
 
                     zend_string_release(escaped_key);
                 }
 
                 break;
             case HASH_KEY_IS_LONG:
-                php_stream_printf(stream TSRMLS_CC, "            \"%ld\":\"%p\"", num_key, zval);
+                php_stream_printf(stream TSRMLS_CC, "            \"%ld\":\"%s\"", num_key, zval_id);
                 break;
         }
 

extension/php7/tests/bug-github-76_children_items_not_linked_php7.phpt

@@ -0,0 +1,42 @@
+--TEST--
+Check that all children items are properly linked through their identifiers
+--SKIPIF--
+<?php
+    if (!extension_loaded('json')) die('skip json ext not loaded');
+?>
+--FILE--
+
+<?php
+    $dump = fopen('php://memory', 'rw');
+
+    class MyClass {
+        public $myDeclaredVar;
+    }
+
+    $myObject = new MyClass();
+    $myObject->myDeclaredVar = "My declared var content";
+    $myObject->myUndeclaredVar = "My undeclared content";
+    $myObject->childObject = new stdClass();
+
+    $myArray = [
+        "objectInArray" => new StdClass(),
+        "arrayInArray" => ["foo" => "bar"]
+    ];
+
+    meminfo_dump($dump);
+
+    rewind($dump);
+    $meminfoData = json_decode(stream_get_contents($dump), true);
+    fclose($dump);
+
+    foreach($meminfoData['items'] as $item) {
+        if (isset($item['children'])) {
+            foreach($item['children'] as $child) {
+                if (!isset($meminfoData['items'][$child])) {
+                    echo "Child $child not found!\n";
+                }
+            }
+        }
+    }
+?>
+--EXPECT--