fixed a few memory issues

Harald Radi · Harald Radi · commit bd21994bed15 · 2001-07-26T13:20:44.000Z
diff --git a/ext/com/COM.c b/ext/com/COM.c
@@ -1452,7 +1452,8 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
 			php_variant_to_pval(var_result, return_value, 0, codepage);
 		}
 
-		FREE_VARIANT(var_result);
+//		FREE_VARIANT(var_result);
+		efree(var_result);
 		efree(arguments);
 	}
 
diff --git a/ext/com/conversion.c b/ext/com/conversion.c
@@ -529,11 +529,11 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
 				hr = SafeArrayGetElement(array, indices, (VOID *) &(vv.lVal));
 			}
 			if (FAILED(hr))
-            {
+			{
 				/* Failure to retieve an element probably means the array is sparse */
 				/* So leave the php array sparse too */
 				continue;
-            }
+			}
 			/* Create an element to be added to the array */
 			ALLOC_ZVAL(element);
 			/* Call ourself again to handle the base type conversion */
@@ -560,10 +560,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
 				add_index_zval(pval_arg, ii, element);
 			}
 		}
-        SafeArrayUnlock(array);
-		/* Clean up the SafeArray since that is our responsibility */
-		SafeArrayDestroyData(array);
-		SafeArrayDestroyDescriptor(array);
+		SafeArrayUnlock(array);
 	}
 	else switch(var_arg->vt & ~VT_BYREF)
 	{		
@@ -683,13 +680,11 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
 			if(V_ISBYREF(var_arg))
 			{
 				Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(*V_BSTRREF(var_arg), &Z_STRLEN_P(pval_arg), persistent, codepage);
-				SysFreeString(*V_BSTRREF(var_arg));
 				efree(V_BSTRREF(var_arg));
 			}
 			else
 			{
 				Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(V_BSTR(var_arg), &Z_STRLEN_P(pval_arg), persistent, codepage);
-				SysFreeString(V_BSTR(var_arg));
 			}
 
 			Z_TYPE_P(pval_arg) = IS_STRING;
diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c
@@ -1452,7 +1452,8 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro
 			php_variant_to_pval(var_result, return_value, 0, codepage);
 		}
 
-		FREE_VARIANT(var_result);
+//		FREE_VARIANT(var_result);
+		efree(var_result);
 		efree(arguments);
 	}
 
diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
@@ -529,11 +529,11 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
 				hr = SafeArrayGetElement(array, indices, (VOID *) &(vv.lVal));
 			}
 			if (FAILED(hr))
-            {
+			{
 				/* Failure to retieve an element probably means the array is sparse */
 				/* So leave the php array sparse too */
 				continue;
-            }
+			}
 			/* Create an element to be added to the array */
 			ALLOC_ZVAL(element);
 			/* Call ourself again to handle the base type conversion */
@@ -560,10 +560,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
 				add_index_zval(pval_arg, ii, element);
 			}
 		}
-        SafeArrayUnlock(array);
-		/* Clean up the SafeArray since that is our responsibility */
-		SafeArrayDestroyData(array);
-		SafeArrayDestroyDescriptor(array);
+		SafeArrayUnlock(array);
 	}
 	else switch(var_arg->vt & ~VT_BYREF)
 	{		
@@ -683,13 +680,11 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
 			if(V_ISBYREF(var_arg))
 			{
 				Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(*V_BSTRREF(var_arg), &Z_STRLEN_P(pval_arg), persistent, codepage);
-				SysFreeString(*V_BSTRREF(var_arg));
 				efree(V_BSTRREF(var_arg));
 			}
 			else
 			{
 				Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(V_BSTR(var_arg), &Z_STRLEN_P(pval_arg), persistent, codepage);
-				SysFreeString(V_BSTR(var_arg));
 			}
 
 			Z_TYPE_P(pval_arg) = IS_STRING;

Original file line number	Diff line number	Diff line change
`@@ -1452,7 +1452,8 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro`
`1452`	`1452`	`php_variant_to_pval(var_result, return_value, 0, codepage);`
`1453`	`1453`	`}`
`1454`	`1454`
`1455`		`- FREE_VARIANT(var_result);`
	`1455`	`+// FREE_VARIANT(var_result);`
	`1456`	`+ efree(var_result);`
`1456`	`1457`	`efree(arguments);`
`1457`	`1458`	`}`
`1458`	`1459`
Original file line number	Diff line number	Diff line change
`@@ -529,11 +529,11 @@ PHPAPI int php_variant_to_pval(VARIANT var_arg, pval pval_arg, int persistent,`
`529`	`529`	`hr = SafeArrayGetElement(array, indices, (VOID *) &(vv.lVal));`
`530`	`530`	`}`
`531`	`531`	`if (FAILED(hr))`
`532`		`- {`
	`532`	`+ {`
`533`	`533`	`/* Failure to retieve an element probably means the array is sparse */`
`534`	`534`	`/* So leave the php array sparse too */`
`535`	`535`	`continue;`
`536`		`- }`
	`536`	`+ }`
`537`	`537`	`/* Create an element to be added to the array */`
`538`	`538`	`ALLOC_ZVAL(element);`
`539`	`539`	`/* Call ourself again to handle the base type conversion */`
`@@ -560,10 +560,7 @@ PHPAPI int php_variant_to_pval(VARIANT var_arg, pval pval_arg, int persistent,`
`560`	`560`	`add_index_zval(pval_arg, ii, element);`
`561`	`561`	`}`
`562`	`562`	`}`
`563`		`- SafeArrayUnlock(array);`
`564`		`- /* Clean up the SafeArray since that is our responsibility */`
`565`		`- SafeArrayDestroyData(array);`
`566`		`- SafeArrayDestroyDescriptor(array);`
	`563`	`+ SafeArrayUnlock(array);`
`567`	`564`	`}`
`568`	`565`	`else switch(var_arg->vt & ~VT_BYREF)`
`569`	`566`	`{`
`@@ -683,13 +680,11 @@ PHPAPI int php_variant_to_pval(VARIANT var_arg, pval pval_arg, int persistent,`
`683`	`680`	`if(V_ISBYREF(var_arg))`
`684`	`681`	`{`
`685`	`682`	`Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(*V_BSTRREF(var_arg), &Z_STRLEN_P(pval_arg), persistent, codepage);`
`686`		`- SysFreeString(*V_BSTRREF(var_arg));`
`687`	`683`	`efree(V_BSTRREF(var_arg));`
`688`	`684`	`}`
`689`	`685`	`else`
`690`	`686`	`{`
`691`	`687`	`Z_STRVAL_P(pval_arg) = php_OLECHAR_to_char(V_BSTR(var_arg), &Z_STRLEN_P(pval_arg), persistent, codepage);`
`692`		`- SysFreeString(V_BSTR(var_arg));`
`693`	`688`	`}`
`694`	`689`
`695`	`690`	`Z_TYPE_P(pval_arg) = IS_STRING;`