Modify a HeapValidate assert in the Win32 native allocator.

FossilOrigin-Name: aaed7d1d3ba0aef9f99fb157d3704b9f279aef71

diff --git a/manifest b/manifest
index 788304c34438a75c9569f44bd438baa5de3197c2..da464211cbbc8458362d250daddce4d859711b26 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\sOP_IdxDelete\sas\sused\sby\sREPLACE\sconflict\sresolution\sthat\ncomes\sup\sdue\sto\srecent\senhancements\sthat\sreduce\sthe\swork\srequired\sfor\nUNIQUE\sNOT\sNULL\sindices.
-D 2013-11-11T00:43:21.301
+C Modify\sa\sHeapValidate\sassert\sin\sthe\sWin32\snative\sallocator.
+D 2013-11-11T01:42:10.343
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in d12e4455cf7a36e42d3949876c1c3b88ff70867a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -205,7 +205,7 @@ F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c 143624d9eabb3b997c59cf594e0d06c56edd43e9
-F src/os_win.c 2027d0a4df8201024bd23f173a74ff8cb0085fed
+F src/os_win.c 77c84ddeb5b2f91247f458aa7da9ef9f87686f40
 F src/pager.c 2aa4444ffe86e9282d03bc349a4a5e49bd77c0e8
 F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
 F src/parse.y 073a8294e1826f1b1656e84806b77e4199f4bb57
@@ -1135,7 +1135,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 023233f16ec2e6f582a7491643036ba5cad9379c
-R 4e1462bf2dbaa7aef77689cfb0587b10
-U drh
-Z 4e3adcf9d2d8f00e72d357ee17f79df9
+P 61d7d4753f36932293c0eb1ca893b17d18355ad3
+R b014d6b5ce6c6524016e96cbc55be809
+U mistachkin
+Z cec9e730830a0b61444c297cab7391e3

diff --git a/manifest.uuid b/manifest.uuid
index dac7109102a96b58a0d0ecabccb1d9db32127b77..9f320db6d460ea11eec749987f497ef8ecaaba05 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-61d7d4753f36932293c0eb1ca893b17d18355ad3
\ No newline at end of file
+aaed7d1d3ba0aef9f99fb157d3704b9f279aef71
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 79e7297a07c57a0c3a89ed71bed30f9747e13cf6..4167b3107e6bd61abf1f3f5ff392774ee53aa591 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -1370,7 +1370,7 @@ static int winMemSize(void *p){
   assert( hHeap!=0 );
   assert( hHeap!=INVALID_HANDLE_VALUE );
 #if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_MALLOC_VALIDATE)
-  assert( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, NULL) );
+  assert( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, p) );
 #endif
   if( !p ) return 0;
   n = osHeapSize(hHeap, SQLITE_WIN32_HEAP_FLAGS, p);