iliaa Wed Jul 7 21:18:43 2004 EDT
Modified files:
/php-src/ext/com_dotnet com_saproxy.c
Log:
Last dangerous alloca() bits.
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_saproxy.c?r1=1.12&r2=1.13&ty=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.12
php-src/ext/com_dotnet/com_saproxy.c:1.13
--- php-src/ext/com_dotnet/com_saproxy.c:1.12 Tue May 4 11:03:48 2004
+++ php-src/ext/com_dotnet/com_saproxy.c Wed Jul 7 21:18:43 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_saproxy.c,v 1.12 2004/05/04 15:03:48 wez Exp $ */
+/* $Id: com_saproxy.c,v 1.13 2004/07/08 01:18:43 iliaa Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -168,7 +168,7 @@
VariantInit(&v);
/* we can return a real value */
- indices = do_alloca(dims * sizeof(LONG));
+ indices = emalloc(dims * sizeof(LONG));
/* copy indices from proxy */
for (i = 0; i < dims; i++) {
@@ -191,7 +191,7 @@
res = SafeArrayGetElement(sa, indices, &v.lVal);
}
- free_alloca(indices);
+ efree(indices);
if (SUCCEEDED(res)) {
php_com_wrap_variant(return_value, &v, proxy->obj->code_page
TSRMLS_CC);
@@ -244,7 +244,7 @@
VARTYPE vt;
dims = SafeArrayGetDim(V_ARRAY(&proxy->obj->v));
- indices = do_alloca(dims * sizeof(LONG));
+ indices = emalloc(dims * sizeof(LONG));
/* copy indices from proxy */
for (i = 0; i < dims; i++) {
convert_to_long(proxy->indices[i]);
@@ -272,7 +272,7 @@
res = SafeArrayPutElement(V_ARRAY(&proxy->obj->v), indices,
&v.lVal);
}
- free_alloca(indices);
+ efree(indices);
VariantClear(&v);
if (FAILED(res)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
