iliaa Mon Mar 8 20:09:36 2004 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Change float operations to safe_emalloc().
Original idea by Sascha (see sess_sqlite.c)
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.131&r2=1.132&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.131 php-src/ext/sqlite/sqlite.c:1.132
--- php-src/ext/sqlite/sqlite.c:1.131 Mon Mar 8 13:05:38 2004
+++ php-src/ext/sqlite/sqlite.c Mon Mar 8 20:09:35 2004
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.131 2004/03/08 18:05:38 helly Exp $
+ $Id: sqlite.c,v 1.132 2004/03/09 01:09:35 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1055,7 +1055,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.131 2004/03/08 18:05:38 helly Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.132 2004/03/09 01:09:35 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();
@@ -2612,7 +2612,7 @@
/* binary string */
int enclen;
- ret = emalloc( 1 + 5 + stringlen * ((float) 256 / (float) 253) );
+ ret = safe_emalloc(1 + stringlen / 254, 257, 3);
ret[0] = '\x01';
enclen = php_sqlite_encode_binary(string, stringlen, ret+1);
RETVAL_STRINGL(ret, enclen+1, 0);
@@ -2842,7 +2842,7 @@
int enclen;
char *ret;
- ret = emalloc( 1 + 5 + datalen * ((float) 256 / (float) 253) );
+ ret = safe_emalloc(1 + datalen / 254, 257, 3);
ret[0] = '\x01';
enclen = php_sqlite_encode_binary(data, datalen, ret+1);
RETVAL_STRINGL(ret, enclen+1, 0);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
