Merge pull request #63

Author: jmikola

src/bson.c

@@ -1103,6 +1103,7 @@ PHP_FUNCTION(fromJSON)
 
 	if (bson_init_from_json(&b, (const char *)data, data_len, &error)) {
 		RETVAL_STRINGL((const char *) bson_get_data(&b), b.len, 1);
+		bson_destroy(&b);
 	} else {
 		RETURN_NULL();
 	}

tests/bson/bug0341.phpt

@@ -0,0 +1,50 @@
+--TEST--
+PHPC-341: fromJSON() leaks when JSON contains array or object fields
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$tests = array(
+    '{ "foo": "yes", "bar" : false }',
+    '{ "foo": "no", "array" : [ 5, 6 ] }',
+    '{ "foo": "no", "obj" : { "embedded" : 3.14 } }',
+);
+
+foreach ($tests as $test) {
+    $bson = fromJSON($test);
+    var_dump(toPHP($bson));
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+object(stdClass)#%d (2) {
+  ["foo"]=>
+  string(3) "yes"
+  ["bar"]=>
+  bool(false)
+}
+object(stdClass)#%d (2) {
+  ["foo"]=>
+  string(2) "no"
+  ["array"]=>
+  array(2) {
+    [0]=>
+    int(5)
+    [1]=>
+    int(6)
+  }
+}
+object(stdClass)#%d (2) {
+  ["foo"]=>
+  string(2) "no"
+  ["obj"]=>
+  object(stdClass)#%d (1) {
+    ["embedded"]=>
+    float(3.14)
+  }
+}
+===DONE===