tony2001 Sat Sep 9 10:59:05 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sqlite/libsqlite/src vdbe.c
/php-src NEWS
Log:
MFH: fix #38759 (PDO sqlite2 empty query causes segfault)
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite/libsqlite/src/vdbe.c?r1=1.7.4.1&r2=1.7.4.1.2.1&diff_format=u
Index: php-src/ext/sqlite/libsqlite/src/vdbe.c
diff -u php-src/ext/sqlite/libsqlite/src/vdbe.c:1.7.4.1
php-src/ext/sqlite/libsqlite/src/vdbe.c:1.7.4.1.2.1
--- php-src/ext/sqlite/libsqlite/src/vdbe.c:1.7.4.1 Wed Sep 7 15:11:33 2005
+++ php-src/ext/sqlite/libsqlite/src/vdbe.c Sat Sep 9 10:59:05 2006
@@ -43,7 +43,7 @@
** in this file for details. If in doubt, do not deviate from existing
** commenting and indentation practices when changing or adding code.
**
-** $Id: vdbe.c,v 1.7.4.1 2005/09/07 15:11:33 iliaa Exp $
+** $Id: vdbe.c,v 1.7.4.1.2.1 2006/09/09 10:59:05 tony2001 Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -114,7 +114,7 @@
sqlite *db;
int rc;
- if( p->magic!=VDBE_MAGIC_RUN ){
+ if( !p || p->magic!=VDBE_MAGIC_RUN ){
return SQLITE_MISUSE;
}
db = p->db;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.239&r2=1.2027.2.547.2.240&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.239 php-src/NEWS:1.2027.2.547.2.240
--- php-src/NEWS:1.2027.2.547.2.239 Fri Sep 8 20:10:46 2006
+++ php-src/NEWS Sat Sep 9 10:59:05 2006
@@ -5,6 +5,7 @@
(marci at balabit dot hu, Tony)
- Removed current working directory from the php.ini search path for CLI and
readded it for other SAPIs (restore to pre 5.1.x behaviour). (Edin)
+- Fixed bug #38759 (PDO sqlite2 empty query causes segfault). (Tony)
- Fixed bug #38700 (SoapClient::__getTypes never returns). (Dmitry)
- Fixed bug #38693 (curl_multi_add_handle() set curl handle to null). (Ilia)
- Fixed bug #38661 (mixed-case URL breaks url-wrappers). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
