iliaa Mon Aug 18 00:41:48 2003 EDT
Modified files:
/php-src/ext/odbc birdstep.c
/php-src/ext/com_dotnet com_handlers.c com_olechar.c com_com.c
Log:
emalloc -> safe_emalloc
Index: php-src/ext/odbc/birdstep.c
diff -u php-src/ext/odbc/birdstep.c:1.8 php-src/ext/odbc/birdstep.c:1.9
--- php-src/ext/odbc/birdstep.c:1.8 Mon Jun 16 12:36:41 2003
+++ php-src/ext/odbc/birdstep.c Mon Aug 18 00:41:47 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: birdstep.c,v 1.8 2003/06/16 16:36:41 andrey Exp $ */
+/* $Id: birdstep.c,v 1.9 2003/08/18 04:41:47 iliaa Exp $ */
/*
* TODO:
@@ -345,7 +345,7 @@
efree(res);
RETURN_LONG(rows);
} else { /* Was SELECT query */
- res->values = (VResVal *)emalloc(sizeof(VResVal)*cols);
+ res->values = (VResVal *)safe_emalloc(sizeof(VResVal), cols, 0);
res->numcols = cols;
for ( i = 0; i < cols; i++ ) {
SQLColAttributes(res->hstmt,i+1,SQL_COLUMN_NAME,
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.1
php-src/ext/com_dotnet/com_handlers.c:1.2
--- php-src/ext/com_dotnet/com_handlers.c:1.1 Thu Aug 14 12:49:55 2003
+++ php-src/ext/com_dotnet/com_handlers.c Mon Aug 18 00:41:48 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_handlers.c,v 1.1 2003/08/14 16:49:55 wez Exp $ */
+/* $Id: com_handlers.c,v 1.2 2003/08/18 04:41:48 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -353,7 +353,7 @@
nargs = ZEND_NUM_ARGS();
if (nargs) {
- args = (zval **)emalloc(sizeof(zval *) * nargs);
+ args = (zval **)safe_emalloc(sizeof(zval *), nargs, 0);
zend_get_parameters_array(ht, nargs, args);
}
Index: php-src/ext/com_dotnet/com_olechar.c
diff -u php-src/ext/com_dotnet/com_olechar.c:1.1
php-src/ext/com_dotnet/com_olechar.c:1.2
--- php-src/ext/com_dotnet/com_olechar.c:1.1 Thu Aug 14 12:49:55 2003
+++ php-src/ext/com_dotnet/com_olechar.c Mon Aug 18 00:41:48 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_olechar.c,v 1.1 2003/08/14 16:49:55 wez Exp $ */
+/* $Id: com_olechar.c,v 1.2 2003/08/18 04:41:48 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -45,7 +45,7 @@
}
if (strlen > 0) {
- olestring = (OLECHAR*)emalloc(sizeof(OLECHAR) * string_len);
+ olestring = (OLECHAR*)safe_emalloc(sizeof(OLECHAR), string_len, 0);
ok = MultiByteToWideChar(codepage, flags, string, string_len,
olestring, string_len);
} else {
ok = FALSE;
@@ -75,7 +75,7 @@
length = WideCharToMultiByte(codepage, 0, olestring, -1, NULL, 0, NULL, NULL);
if (length) {
- string = (char*)emalloc(sizeof(char) * length);
+ string = (char*)safe_emalloc(sizeof(char), length, 0);
length = WideCharToMultiByte(codepage, 0, olestring, -1, string,
length, NULL, NULL);
ok = length > 0;
} else {
Index: php-src/ext/com_dotnet/com_com.c
diff -u php-src/ext/com_dotnet/com_com.c:1.1 php-src/ext/com_dotnet/com_com.c:1.2
--- php-src/ext/com_dotnet/com_com.c:1.1 Thu Aug 14 12:49:55 2003
+++ php-src/ext/com_dotnet/com_com.c Mon Aug 18 00:41:48 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_com.c,v 1.1 2003/08/14 16:49:55 wez Exp $ */
+/* $Id: com_com.c,v 1.2 2003/08/18 04:41:48 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -373,7 +373,7 @@
int i;
if (nargs) {
- vargs = (VARIANT*)emalloc(sizeof(VARIANT) * nargs);
+ vargs = (VARIANT*)safe_emalloc(sizeof(VARIANT), nargs, 0);
}
/* Invoke'd args are in reverse order */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
