From 1e2a3e8b7cb8568cf49e0c51f036c3ad74e88aa7 Mon Sep 17 00:00:00 2001
From: Rob Richards <rrichards@php.net>
Date: Sat, 4 Feb 2006 10:59:18 +0000
Subject: [PATCH] MFB51: Fixed bug #34272 (empty array onto COM object blows
 up) fix mem leaks WS fixes add test

---
 ext/com_dotnet/com_handlers.c      |  2 ++
 ext/com_dotnet/com_variant.c       |  2 +-
 ext/com_dotnet/tests/bug34272.phpt | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 ext/com_dotnet/tests/bug34272.phpt

diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c
index 9603c1dac2..d535affc5d 100644
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@@ -627,9 +627,11 @@ void php_com_object_free_storage(void *object TSRMLS_DC)
 	VariantClear(&obj->v);
 
 	if (obj->method_cache) {
+		zend_hash_destroy(obj->method_cache);
 		FREE_HASHTABLE(obj->method_cache);
 	}
 	if (obj->id_of_name_cache) {
+		zend_hash_destroy(obj->id_of_name_cache);
 		FREE_HASHTABLE(obj->id_of_name_cache);
 	}
 	efree(obj);
diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
index 98eda0bffd..07dc98d3c7 100644
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@@ -40,7 +40,7 @@ static void safe_array_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
 	int keytype;
 	char *strindex;
 	int strindexlen;
-	long intindex;
+	long intindex = -1;
 	long max_index = 0;
 	VARIANT *va;
 	zval **item;
diff --git a/ext/com_dotnet/tests/bug34272.phpt b/ext/com_dotnet/tests/bug34272.phpt
new file mode 100644
index 0000000000..3a65e2ce28
--- /dev/null
+++ b/ext/com_dotnet/tests/bug34272.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #34272 (empty array onto COM object blows up)
+--SKIPIF--
+<?php 
+if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
+--FILE--
+<?php 
+error_reporting(E_ALL);
+
+try {
+	$dict = new COM("Scripting.Dictionary");
+	$dict->add('foo', array());
+	print sizeof($dict['foo'])."\n";
+	$dict->add('bar', array(23));
+	print sizeof($dict['bar'])." \n";
+} catch (Exception $e) {
+	print $e;
+}
+?>
+--EXPECT--
+0
+1
-- 
2.40.0