From: mistachkin <mistachkin@noemail.net>
Date: Mon, 23 Jul 2012 06:47:30 +0000 (+0000)
Subject: Add an assert() to help verify the return code from the Win32 thread wait function.
X-Git-Tag: version-3.8.7~132^2~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a806475f86220a2bb19033eb8bf304c1601f4994;p=thirdparty%2Fsqlite.git

Add an assert() to help verify the return code from the Win32 thread wait function.

FossilOrigin-Name: ed3dc7a89f3416622fcd741ae5fba437929d06d6
---

diff --git a/manifest b/manifest
index da25a187c6..e4cf469b13 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\simplementation\sof\sthe\sWin32\sthread\swait\sfunction.
-D 2012-07-23T02:00:38.699
+C Add\san\sassert()\sto\shelp\sverify\sthe\sreturn\scode\sfrom\sthe\sWin32\sthread\swait\sfunction.
+D 2012-07-23T06:47:30.102
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a89f9692d1369faa4071310164ffba0504c324d
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -231,7 +231,7 @@ F src/test_vfs.c da6d0d982b11756c94c1760196355d33d03ff745
 F src/test_vfstrace.c 6b28adb2a0e8ecd0f2e3581482e1f658b11b4067
 F src/test_wholenumber.c 3d2b9ed1505c40ad5c5ca2ad16ae7a289d6cc251
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
-F src/threads.c 82ea90092f36d02f887e85f7559efc1519f9edd3
+F src/threads.c cde5bd24ab5b33bb694c59f4236ecd56ad8da9b5
 F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
 F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
 F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
@@ -1006,7 +1006,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 793195d37109c75eba84f7190c8fe0b8722f76f7
-R 49885bc11b122527dda4cd8bcfe1cfa0
+P 049b04117353c3e163ffc87916cbe121403a2821
+R 8ad4cfcece99f2543c3fc25ff90ff8da
 U mistachkin
-Z b0f357746aebd8329bde52b662a0497e
+Z c7ca4753dded1e68bd82c1792e2c5272
diff --git a/manifest.uuid b/manifest.uuid
index 1d07b1a32a..acb6e11d72 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-049b04117353c3e163ffc87916cbe121403a2821
\ No newline at end of file
+ed3dc7a89f3416622fcd741ae5fba437929d06d6
\ No newline at end of file
diff --git a/src/threads.c b/src/threads.c
index dfb44a7c2f..61e58f494b 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -132,6 +132,7 @@ int sqlite3ThreadJoin(SQLiteThread *p, void **ppOut){
   assert( ppOut!=0 );
   if( p==0 ) return SQLITE_NOMEM;
   rc = sqlite3Win32Wait((HANDLE)p->tid);
+  assert( rc!=WAIT_IO_COMPLETION );
   if( rc==WAIT_OBJECT_0 ) *ppOut = p->pResult;
   sqlite3_free(p);
   return (rc==WAIT_OBJECT_0) ? SQLITE_OK : SQLITE_ERROR;