/ Check-in [aaed7d1d]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Modify a HeapValidate assert in the Win32 native allocator.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: aaed7d1d3ba0aef9f99fb157d3704b9f279aef71
User & Date: mistachkin 2013-11-11 01:42:10
Context
2013-11-11
02:46
Fix several harmless compiler warnings. check-in: e6ff492f user: mistachkin tags: trunk
01:42
Modify a HeapValidate assert in the Win32 native allocator. check-in: aaed7d1d user: mistachkin tags: trunk
00:43
Fix a problem in OP_IdxDelete as used by REPLACE conflict resolution that comes up due to recent enhancements that reduce the work required for UNIQUE NOT NULL indices. check-in: 61d7d475 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_win.c.

  1366   1366     SIZE_T n;
  1367   1367   
  1368   1368     winMemAssertMagic();
  1369   1369     hHeap = winMemGetHeap();
  1370   1370     assert( hHeap!=0 );
  1371   1371     assert( hHeap!=INVALID_HANDLE_VALUE );
  1372   1372   #if !SQLITE_OS_WINRT && defined(SQLITE_WIN32_MALLOC_VALIDATE)
  1373         -  assert( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, NULL) );
         1373  +  assert( osHeapValidate(hHeap, SQLITE_WIN32_HEAP_FLAGS, p) );
  1374   1374   #endif
  1375   1375     if( !p ) return 0;
  1376   1376     n = osHeapSize(hHeap, SQLITE_WIN32_HEAP_FLAGS, p);
  1377   1377     if( n==(SIZE_T)-1 ){
  1378   1378       sqlite3_log(SQLITE_NOMEM, "failed to HeapSize block %p (%lu), heap=%p",
  1379   1379                   p, osGetLastError(), (void*)hHeap);
  1380   1380       return 0;