From: drh Date: Thu, 17 Nov 2011 11:43:19 +0000 (+0000) Subject: Restore the test for sqlite3OsFullPathname() failure that was mistakenly X-Git-Tag: mountain-lion~9^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=070ad6b6fee996e639fd31e5189c8319407e343f;p=thirdparty%2Fsqlite.git Restore the test for sqlite3OsFullPathname() failure that was mistakenly removed when [ceee03c79a] was backed out by [69ec53fc1c]. FossilOrigin-Name: 4d3cf9e1d8ac356db5a708913f614e42a6a56b94 --- diff --git a/manifest b/manifest index cb7ea23d33..59cb7955f8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\ssqlite3_db_filename()\sinterface. -D 2011-11-17T00:56:20.474 +C Restore\sthe\stest\sfor\ssqlite3OsFullPathname()\sfailure\sthat\swas\smistakenly\s\nremoved\swhen\s[ceee03c79a]\swas\sbacked\sout\sby\s[69ec53fc1c]. +D 2011-11-17T11:43:19.664 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -125,7 +125,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34 F src/backup.c 4368158da74d4711888e03264105c5c527d76caf F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 -F src/btree.c 2521a74f04cf288497af3b318fa3a31efb272ef6 +F src/btree.c 80ea65224512884bb72976c93810d2dcaecc1353 F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce F src/btreeInt.h ea863a819224d3e6845ad1e39954d41558b8cd8b F src/build.c 8915bb6d72ead998f94c2756ea8d143c77709b70 @@ -976,7 +976,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P 69ec53fc1c60b07bf4aaa983dcd5bf3164fb1ea5 -R 99f71d23f57bbcc6e05ddde9985c021b +P 93a947989b57959aacc37007a143fdf3921793ab +R 332ce6cc33326de9806334bfc2a7be92 U drh -Z aa529bb687e7c2c3b8e94ee609022d00 +Z 85dd2759b5a8c1b6d06bef9bf12e7a1b diff --git a/manifest.uuid b/manifest.uuid index 3f50082423..20c7bfea32 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -93a947989b57959aacc37007a143fdf3921793ab \ No newline at end of file +4d3cf9e1d8ac356db5a708913f614e42a6a56b94 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index a1b05e1f3e..713016e756 100644 --- a/src/btree.c +++ b/src/btree.c @@ -1776,7 +1776,12 @@ int sqlite3BtreeOpen( sqlite3_free(p); return SQLITE_NOMEM; } - sqlite3OsFullPathname(pVfs, zFilename, nFullPathname, zFullPathname); + rc = sqlite3OsFullPathname(pVfs, zFilename, nFullPathname, zFullPathname); + if( rc ){ + sqlite3_free(zFullPathname); + sqlite3_free(p); + return rc; + } #if SQLITE_THREADSAFE mutexOpen = sqlite3MutexAlloc(SQLITE_MUTEX_STATIC_OPEN); sqlite3_mutex_enter(mutexOpen);