Make sure the output of sqlite3OsFullPathname is initialized even if the

fails due to I/O or OOM errors.

FossilOrigin-Name: e4943adb83819dee06e2e9da25ff6d967ca170de

diff --git a/manifest b/manifest
index ea8a92ea2c5548abcb1da2d33e77b0c33f301a62..24e24d98638eff0223560bfef8b91c82f7f24da1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Fix\sa\sreference\sto\sfreed\smemory\sthat\scan\soccur\sfollowing\san\sOOM\serror\sin\nwhere.c.
-D 2009-11-16T22:54:51
+C Make\ssure\sthe\soutput\sof\ssqlite3OsFullPathname\sis\sinitialized\seven\sif\sthe\nfails\sdue\sto\sI/O\sor\sOOM\serrors.
+D 2009-11-16T23:36:34
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 53f3dfa49f28ab5b80cb083fb7c9051e596bcfa1
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -145,7 +145,7 @@ F src/mutex_os2.c 63b3ea41209297c2fb8950ba465e66a5922e2926
 F src/mutex_unix.c 04a25238abce7e3d06b358dcf706e26624270809
 F src/mutex_w32.c 9ec75bcef0ca722821be7968c320fd725abfb984
 F src/notify.c f799bbda67ab6619b36b0a24153b49518874a203
-F src/os.c 1914b48263fe137d9f50985ab18e8073e6ab99c4
+F src/os.c 4500ff276e277730776fe9b6c6c5930383ec4000
 F src/os.h 534b082c3cb349ad05fa6fa0b06087e022af282c
 F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30
 F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f
@@ -771,14 +771,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 15d215d62df72c1bf1e605629692ee40d96546a6
-R d253a6762b5dd3d0bde3393a87de556c
+P 929b6047391411c6f539e47afe6b63d16e352ccb
+R 13facd3cb5b58e8321f51a81ba26b282
 U drh
-Z 12a310b917e34b7cdac3faa62159e6fc
+Z 5557a9bdd7c9ffd1ef2b1b912759377d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLAdg+oxKgR168RlERAgPrAJ9mhwpaoSYOxmJuy6MMcqfG8OzxTQCfVnkP
-04+k4Lpu0ZIEUGV/hFCqsz8=
-=itlO
+iD8DBQFLAeIFoxKgR168RlERAm5zAJ9+zjsxTXETPUidpMT7BNRJuUEPcQCdGbWG
+c0lIKv9PQEH8pwwJkLAteDg=
+=JRXc
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index a8f7033d3aaa69531bc57739a87f893055e46a4b..b61e4f79e71e27da09e4e12e786903e34e8a5100 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-929b6047391411c6f539e47afe6b63d16e352ccb
\ No newline at end of file
+e4943adb83819dee06e2e9da25ff6d967ca170de
\ No newline at end of file

diff --git a/src/os.c b/src/os.c
index 33bdead2cbc8ee1f52ce10f9f2c5ced1fe1c4657..598383d5b9f9e697ce39d2adb10fae43b1c04a94 100644 (file)
--- a/src/os.c
+++ b/src/os.c
@@ -138,6 +138,7 @@ int sqlite3OsFullPathname(
   int nPathOut, 
   char *zPathOut
 ){
+  zPathOut[0] = 0;
   return pVfs->xFullPathname(pVfs, zPath, nPathOut, zPathOut);
 }
 #ifndef SQLITE_OMIT_LOAD_EXTENSION