cvs: php-src /ext/sqlite sqlite.c
| From: | Ilia Alshanetsky | Date: | Thu, 22 Apr 2004 22:34:29 +0000 |
| Subject: | cvs: php-src /ext/sqlite sqlite.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-27153@lists.php.net to get a copy of this message | ||
iliaa Thu Apr 22 18:34:29 2004 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Empty query checks, bug #28112.
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.141&r2=1.142&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.141 php-src/ext/sqlite/sqlite.c:1.142
--- php-src/ext/sqlite/sqlite.c:1.141 Thu Apr 22 18:26:02 2004
+++ php-src/ext/sqlite/sqlite.c Thu Apr 22 18:34:29 2004
@@ -17,7 +17,7 @@
| Marcus Boerger <helly@php.net> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.141 2004/04/22 22:26:02 helly Exp $
+ $Id: sqlite.c,v 1.142 2004/04/22 22:34:29 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -112,6 +112,12 @@
PG(suppress_errors) = 0; \
EG(exception) = zend_throw_exception(sqlite_ce_exception, message, 0 TSRMLS_CC);
+#define PHP_SQLITE_EMPTY_QUERY \
+ if (!sql_len) { \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot execute empty query."); \
+ RETURN_FALSE; \
+ }
+
struct php_sqlite_result {
struct php_sqlite_db *db;
sqlite_vm *vm;
@@ -1057,7 +1063,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.141 2004/04/22 22:26:02 helly Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id:
sqlite.c,v 1.142 2004/04/22 22:34:29 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();
@@ -1538,6 +1544,8 @@
DB_FROM_ZVAL(db, &zdb);
}
+ PHP_SQLITE_EMPTY_QUERY;
+
/* avoid doing work if we can */
if (!return_value_used) {
db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
@@ -1645,6 +1653,8 @@
DB_FROM_ZVAL(db, &zdb);
}
+ PHP_SQLITE_EMPTY_QUERY;
+
/* avoid doing work if we can */
if (!return_value_used) {
db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
@@ -2004,6 +2014,8 @@
DB_FROM_ZVAL(db, &zdb);
}
+ PHP_SQLITE_EMPTY_QUERY;
+
/* avoid doing work if we can */
if (!return_value_used) {
db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);
@@ -2118,6 +2130,8 @@
DB_FROM_ZVAL(db, &zdb);
}
+ PHP_SQLITE_EMPTY_QUERY;
+
/* avoid doing work if we can */
if (!return_value_used) {
db->last_err_code = sqlite_exec(db->db, sql, NULL, NULL, &errtext);