Add retry logic for AV defense to winAccess(). Also allow OS tracing to be

enabled by a compile-time option.

FossilOrigin-Name: a6b85c73406caa3bf0585341c8ebc9897a1884f4

diff --git a/manifest b/manifest
index 42fc3e12f1ca94d811b72af368a194d0cf8ddfa8..b359bc1a2202089d4eb6fdae48a0fc67720f3cdc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Also\sadd\sthe\ssqlite3-all.c\starget\sto\sthe\sMSVC\smakefile.
-D 2011-07-22T11:23:49.199
+C Add\sretry\slogic\sfor\sAV\sdefense\sto\swinAccess().\s\sAlso\sallow\sOS\stracing\sto\sbe\nenabled\sby\sa\scompile-time\soption.
+D 2011-07-22T21:25:57.525
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 1e6988b3c11dee9bd5edc0c804bd4468d74a9cdc
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,10 +163,10 @@ F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c fcc717427a80b2ed225373f07b642dc1aad7490b
 F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
-F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
+F src/os_common.h 65a897143b64667d23ed329a7984b9b405accb58
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c dcd6d5782dd30e918dc3d111cdcb1883bfb95345
-F src/os_win.c c5eadb2c0fc11347296a660f77b9844090265c0c
+F src/os_win.c 8449cb4ce1cd50248b7133108532d9582cc6c042
 F src/pager.c 120550e7ef01dafaa2cbb4a0528c0d87c8f12b41
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
@@ -952,7 +952,11 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
-P 71f7be586f5a18493cd516f89c4ecc460bb24462
-R 645e7d58a7503109e1bb3e986974849f
+P 8ce2b74a82264550b0e19da3e0e1a145db940a1c
+R 0af84a25fe935b16dac1aa3e854e0baf
+T *bgcolor * #d0c0ff
+T *branch * av-defense
+T *sym-av-defense *
+T -sym-trunk *
 U drh
-Z aaeed83d2a39a45645a69e9a638df017
+Z 9d105249d1658c472aed05118a4a48f3

diff --git a/manifest.uuid b/manifest.uuid
index e12fc9631153b9393b2bdc8d13fc662ef9db40a5..2b894192c26d77d2115dcb2fbfef2f41dc103d74 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8ce2b74a82264550b0e19da3e0e1a145db940a1c
\ No newline at end of file
+a6b85c73406caa3bf0585341c8ebc9897a1884f4
\ No newline at end of file

diff --git a/src/os_common.h b/src/os_common.h
index eba856be8adab39dca61d1c70eae74016da3212e..aa3e18a8c52a7f751f66e9d048995254b2b63353 100644 (file)
--- a/src/os_common.h
+++ b/src/os_common.h
@@ -30,10 +30,13 @@
 #endif
 
 #ifdef SQLITE_DEBUG
-int sqlite3OSTrace = 0;
-#define OSTRACE(X)          if( sqlite3OSTrace ) sqlite3DebugPrintf X
+# ifndef SQLITE_DEBUG_OS_TRACE
+#   define SQLITE_DEBUG_OS_TRACE 0
+# endif
+  int sqlite3OSTrace = SQLITE_DEBUG_OS_TRACE;
+# define OSTRACE(X)          if( sqlite3OSTrace ) sqlite3DebugPrintf X
 #else
-#define OSTRACE(X)
+# define OSTRACE(X)
 #endif
 
 /*

diff --git a/src/os_win.c b/src/os_win.c
index 2d4f0adad2f46a50b55bccf3eccc217fa78e7e69..5d9bf5984306e17b974a0a35122805325a8b801c 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -2452,11 +2452,13 @@ static int winAccess(
     return SQLITE_NOMEM;
   }
   if( isNT() ){
+    int cnt = 0;
     WIN32_FILE_ATTRIBUTE_DATA sAttrData;
     memset(&sAttrData, 0, sizeof(sAttrData));
-    if( GetFileAttributesExW((WCHAR*)zConverted,
+    while( (rc = GetFileAttributesExW((WCHAR*)zConverted,
                              GetFileExInfoStandard, 
-                             &sAttrData) ){
+                             &sAttrData)) && rc==0 && retryIoerr(&cnt) ){}
+    if( rc ){
       /* For an SQLITE_ACCESS_EXISTS query, treat a zero-length file
       ** as if it does not exist.
       */