iliaa Fri Apr 9 14:02:14 2004 EDT
Modified files:
/php-src/ext/sqlite/libsqlite/src os.c
/php-src NEWS
Log:
Fixed bug #27928 (sqlite incorrectly handles invalid filenames).
http://cvs.php.net/diff.php/php-src/ext/sqlite/libsqlite/src/os.c?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/sqlite/libsqlite/src/os.c
diff -u php-src/ext/sqlite/libsqlite/src/os.c:1.5
php-src/ext/sqlite/libsqlite/src/os.c:1.6
--- php-src/ext/sqlite/libsqlite/src/os.c:1.5 Wed Jan 14 12:08:27 2004
+++ php-src/ext/sqlite/libsqlite/src/os.c Fri Apr 9 14:02:02 2004
@@ -34,6 +34,9 @@
# ifndef O_BINARY
# define O_BINARY 0
# endif
+# ifndef EISDIR
+# define EISDIR 21
+# endif
#endif
@@ -464,6 +467,9 @@
id->dirfd = -1;
id->fd = open(zFilename, O_RDWR|O_CREAT|O_LARGEFILE|O_BINARY, 0644);
if( id->fd<0 ){
+ if (errno == EISDIR) {
+ return SQLITE_CANTOPEN;
+ }
id->fd = open(zFilename, O_RDONLY|O_LARGEFILE|O_BINARY);
if( id->fd<0 ){
return SQLITE_CANTOPEN;
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1673&r2=1.1674&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1673 php-src/NEWS:1.1674
--- php-src/NEWS:1.1673 Fri Apr 9 10:43:20 2004
+++ php-src/NEWS Fri Apr 9 14:02:05 2004
@@ -10,6 +10,7 @@
- Changed SQLite extension to use studlyCaps convention in its OO API. (Marcus)
- Changed __construct() to always take precedence over old style constructor.
(Dmitry)
+- Fixed bug #27928 (sqlite incorrectly handles invalid filenames). (Ilia)
- Fixed bug #27821 (xml_parse() segfaults when xml_set_object() is called from
class method). (Andi, Rob)
- Fixed bug #27742 (WDSL SOAP Parsing Schema bug). (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
