SQLite: Check-in [fd6ee549]

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

Overview

Comment:	Fix a faulty assert() in the os_win.c VFS.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| experimental-mmap
Files:	files \| file ages \| folders
SHA1:	fd6ee54969322203c02ce9bd8744e095faf6a69c
User & Date:	drh 2013-04-02 14:37:40

Context

2013-04-02
15:37		Add new test file btreefault.test. check-in: 7fe908af user: dan tags: experimental-mmap
14:37		Fix a faulty assert() in the os_win.c VFS. check-in: fd6ee549 user: drh tags: experimental-mmap
12:04		Add test cases for errors in mmap() or mremap() is os_unix.c. check-in: 3098a3c1 user: dan tags: experimental-mmap

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/os_win.c.

    if( pFd->hMap==NULL ){
      pFd->lastErrno = osGetLastError();
      rc = winLogError(SQLITE_IOERR_MMAP, pFd->lastErrno,
                       "winMapfile", pFd->zPath);
      /* Log the error, but continue normal operation using xRead/xWrite */
      return SQLITE_OK;
    }
    assert( (nNewRnd % winSysInfo.dwPageSize)==0 );
#if SQLITE_OS_WINRT
    pNew = osMapViewOfFileFromApp(pFd->hMap, flags, 0, nMap);
#else
    pNew = osMapViewOfFile(pFd->hMap, flags, 0, 0, (SIZE_T)nMap);
#endif
    if( pNew==NULL ){
      osCloseHandle(pFd->hMap);

    if( pFd->hMap==NULL ){
      pFd->lastErrno = osGetLastError();
      rc = winLogError(SQLITE_IOERR_MMAP, pFd->lastErrno,
                       "winMapfile", pFd->zPath);
      /* Log the error, but continue normal operation using xRead/xWrite */
      return SQLITE_OK;
    }
    assert( (nMap % winSysInfo.dwPageSize)==0 );
#if SQLITE_OS_WINRT
    pNew = osMapViewOfFileFromApp(pFd->hMap, flags, 0, nMap);
#else
    pNew = osMapViewOfFile(pFd->hMap, flags, 0, 0, (SIZE_T)nMap);
#endif
    if( pNew==NULL ){
      osCloseHandle(pFd->hMap);