cvs: php-src /ext/mysqli mysqli.c /ext/sqlite sqlite.c
| From: | Ilia Alshanetsky | Date: | Wed, 31 Dec 2003 19:45:47 +0000 |
| Subject: | cvs: php-src /ext/mysqli mysqli.c /ext/sqlite sqlite.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-25495@lists.php.net to get a copy of this message | ||
iliaa Wed Dec 31 14:45:47 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
/php-src/ext/mysqli mysqli.c
Log:
emalloc() -> safe_emalloc()
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.108 php-src/ext/sqlite/sqlite.c:1.109
--- php-src/ext/sqlite/sqlite.c:1.108 Sun Dec 28 11:26:04 2003
+++ php-src/ext/sqlite/sqlite.c Wed Dec 31 14:45:45 2003
@@ -17,7 +17,7 @@
| Marcus Boerger <helly@php.net> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.108 2003/12/28 16:26:04 helly Exp $
+ $Id: sqlite.c,v 1.109 2003/12/31 19:45:45 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1076,7 +1076,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id:
sqlite.c,v 1.108 2003/12/28 16:26:04 helly Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id:
sqlite.c,v 1.109 2003/12/31 19:45:45 iliaa Exp $");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
@@ -1942,7 +1942,7 @@
Bucket *p;
fci.param_count = 0;
- fci.params = emalloc(sizeof(zval*) * ht->nNumOfElements);
+ fci.params = safe_emalloc(sizeof(zval*), ht->nNumOfElements, 0);
p = ht->pListHead;
while (p != NULL) {
fci.params[fci.param_count++] = (zval**)p->pData;
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.23 php-src/ext/mysqli/mysqli.c:1.24
--- php-src/ext/mysqli/mysqli.c:1.23 Wed Dec 31 03:34:02 2003
+++ php-src/ext/mysqli/mysqli.c Wed Dec 31 14:45:46 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.23 2003/12/31 08:34:02 georg Exp $
+ $Id: mysqli.c,v 1.24 2003/12/31 19:45:46 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -630,7 +630,7 @@
Bucket *p;
fci.param_count = 0;
- fci.params = emalloc(sizeof(zval*) * ht->nNumOfElements);
+ fci.params = safe_emalloc(sizeof(zval*), ht->nNumOfElements, 0);
p = ht->pListHead;
while (p != NULL) {
fci.params[fci.param_count++] = (zval**)p->pData;