From: mistachkin <mistachkin@noemail.net>
Date: Fri, 30 Jun 2017 19:22:33 +0000 (+0000)
Subject: Add some assert() statements in the Win32 interface for lsm1.
X-Git-Tag: version-3.20.0~148
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04222ce52e94d75b4b2d355e5ee018c792e9f549;p=thirdparty%2Fsqlite.git

Add some assert() statements in the Win32 interface for lsm1.

FossilOrigin-Name: d076d58ff108d286f7ac1f81e1ce945d6f4a4f5f97e3b8d5cee6f8d9a6c48d8f
---

diff --git a/ext/lsm1/lsm_win32.c b/ext/lsm1/lsm_win32.c
index 254043dc68..d3189e4297 100644
--- a/ext/lsm1/lsm_win32.c
+++ b/ext/lsm1/lsm_win32.c
@@ -802,10 +802,12 @@ static int lsmWin32OsSleep(lsm_env *pEnv, int us){
 */
 
 static void *lsmWin32OsMalloc(lsm_env *pEnv, size_t N){
+  assert( HeapValidate(GetProcessHeap(), 0, NULL) );
   return HeapAlloc(GetProcessHeap(), 0, (SIZE_T)N);
 }
 
 static void lsmWin32OsFree(lsm_env *pEnv, void *p){
+  assert( HeapValidate(GetProcessHeap(), 0, NULL) );
   if( p ){
     HeapFree(GetProcessHeap(), 0, p);
   }
@@ -813,6 +815,7 @@ static void lsmWin32OsFree(lsm_env *pEnv, void *p){
 
 static void *lsmWin32OsRealloc(lsm_env *pEnv, void *p, size_t N){
   unsigned char *m = (unsigned char *)p;
+  assert( HeapValidate(GetProcessHeap(), 0, NULL) );
   if( 1>N ){
     lsmWin32OsFree(pEnv, p);
     return NULL;
@@ -830,6 +833,7 @@ static void *lsmWin32OsRealloc(lsm_env *pEnv, void *p, size_t N){
 }
 
 static size_t lsmWin32OsMSize(lsm_env *pEnv, void *p){
+  assert( HeapValidate(GetProcessHeap(), 0, NULL) );
   return (size_t)HeapSize(GetProcessHeap(), 0, p);
 }
 
diff --git a/manifest b/manifest
index 14c867ac2f..061a7b213a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\sminor\stypos\sin\slsm1.
-D 2017-06-30T18:12:09.226
+C Add\ssome\sassert()\sstatements\sin\sthe\sWin32\sinterface\sfor\slsm1.
+D 2017-06-30T19:22:33.773
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a
@@ -250,7 +250,7 @@ F ext/lsm1/lsm_tree.c 5d9fb2bc58a1a70c75126bd8d7198f7b627e165b
 F ext/lsm1/lsm_unix.c 57361bcf5b1a1a028f5d66571ee490e9064d2cfb145a2cc9e5ddade467bb551b
 F ext/lsm1/lsm_varint.c b19ae9bd26b5a1e8402fb8a564b25d9542338a41
 F ext/lsm1/lsm_vtab.c fff303ce03168eca9e333add3c1429b3471674b0
-F ext/lsm1/lsm_win32.c 47b67076153f2144e0f2949c28685bd1e9cc21a51d73178f3d467e48af2bf449
+F ext/lsm1/lsm_win32.c 69eb9fd25197432b084037efd69b365d8182ab1e4372a9c45a9c47e542105c5c
 F ext/misc/README.md 8e008c8d2b02e09096b31dfba033253ac27c6c06a18aa5826e299fa7601d90b2
 F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87
 F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb
@@ -1628,7 +1628,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P bacfe8cb3e4d3be736c6789b2ce55ef5603e5c7a289b05b37cae2203cd7f2290
-R a011907843ab4438bc0ee3ce20101fac
+P 0ef777d7474383c0211b19baa4a161cf7fce6570f384dfef368cdab45c1a0f01
+R 0e183fbba6dc1ce556d00bf8d1501330
 U mistachkin
-Z 2edac2ca40bc227a52681398353df5b7
+Z 11a4bd7ecf75eea45a722248445eea4e
diff --git a/manifest.uuid b/manifest.uuid
index 62173550b0..0197ccb528 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0ef777d7474383c0211b19baa4a161cf7fce6570f384dfef368cdab45c1a0f01
\ No newline at end of file
+d076d58ff108d286f7ac1f81e1ce945d6f4a4f5f97e3b8d5cee6f8d9a6c48d8f
\ No newline at end of file