stas Tue Mar 6 02:17:13 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sqlite sqlite.c
Log:
use safe_realloc
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.13.2.6&r2=1.166.2.13.2.7&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.13.2.6
php-src/ext/sqlite/sqlite.c:1.166.2.13.2.7
--- php-src/ext/sqlite/sqlite.c:1.166.2.13.2.6 Mon Jan 1 09:36:07 2007
+++ php-src/ext/sqlite/sqlite.c Tue Mar 6 02:17:13 2007
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.166.2.13.2.6 2007/01/01 09:36:07 sebastian Exp $
+ $Id: sqlite.c,v 1.166.2.13.2.7 2007/03/06 02:17:13 stas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1133,7 +1133,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.166.2.13.2.6 2007/01/01 09:36:07
sebastian Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13.2.7 2007/03/06 02:17:13
stas 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();
@@ -1465,7 +1465,7 @@
/* add the row to our collection */
if (rres->nrows + 1 >= rres->alloc_rows) {
rres->alloc_rows = rres->alloc_rows ?
rres->alloc_rows * 2 : 16;
- rres->table = erealloc(rres->table,
rres->alloc_rows * rres->ncolumns * sizeof(char *));
+ rres->table =
safe_erealloc(rres->table, rres->alloc_rows, rres->ncolumns*sizeof(char *), 0);
}
base = rres->nrows * rres->ncolumns;
for (i = 0; i < rres->ncolumns; i++) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
