/ Check-in [4692ae84]
Login
SQLite training in Houston TX on 2019-11-05 (details)
Part of the 2019 Tcl Conference

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

Overview
Comment:Fix an incorrect, though harmless, assert() in the unix VFS.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4692ae84f93530e27d7c106a60236355e176b7fd
User & Date: drh 2015-12-02 17:40:13
Context
2015-12-02
18:59
Have the sqlite3_column_decltype() API report the declared types for the left-most SELECT statement in a compound SELECT. check-in: 3e1d71fc user: dan tags: trunk
17:40
Fix an incorrect, though harmless, assert() in the unix VFS. check-in: 4692ae84 user: drh tags: trunk
16:10
Remove more (dead) SQLITE_FCNTL_WAL_BLOCK logic from wal.c - code that was missed during the [e1d5320ca08933] check-in. check-in: 58c15c6a user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/os_unix.c.

  4041   4041     pShmNode = pFile->pInode->pShmNode;
  4042   4042     assert( sqlite3_mutex_held(pShmNode->mutex) || pShmNode->nRef==0 );
  4043   4043   
  4044   4044     /* Shared locks never span more than one byte */
  4045   4045     assert( n==1 || lockType!=F_RDLCK );
  4046   4046   
  4047   4047     /* Locks are within range */
  4048         -  assert( n>=1 && n<SQLITE_SHM_NLOCK );
         4048  +  assert( n>=1 && n<=SQLITE_SHM_NLOCK );
  4049   4049   
  4050   4050     if( pShmNode->h>=0 ){
  4051   4051       /* Initialize the locking parameters */
  4052   4052       memset(&f, 0, sizeof(f));
  4053   4053       f.l_type = lockType;
  4054   4054       f.l_whence = SEEK_SET;
  4055   4055       f.l_start = ofst;