diff options
| author |   espie <espie@openbsd.org> | 2013-03-18 10:44:54 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2013-03-18 10:44:54 +0000 |
| commit | f1b0c374cb714f5a02b914bea387b6b573687eb8 (patch) | |
| tree | e508042c8370fb39b8acd5eb62247a7ad51310e0 /lib/libsqlite3/src/vdbesort.c | |
| parent | Provide a way for *drm(4) to prevent the VGA text console wsdisplay(4) instance (diff) | |
| download | wireguard-openbsd-f1b0c374cb714f5a02b914bea387b6b573687eb8.tar.xz wireguard-openbsd-f1b0c374cb714f5a02b914bea387b6b573687eb8.zip | |
update to 3.7.15.2, tested by landry@/miod@
Diffstat (limited to 'lib/libsqlite3/src/vdbesort.c')
| -rw-r--r-- | lib/libsqlite3/src/vdbesort.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/libsqlite3/src/vdbesort.c b/lib/libsqlite3/src/vdbesort.c index ba1e9f0f233..d51bbf54a3e 100644 --- a/lib/libsqlite3/src/vdbesort.c +++ b/lib/libsqlite3/src/vdbesort.c @@ -195,8 +195,11 @@ static int vdbeSorterIterRead( int rc; /* sqlite3OsRead() return code */ /* Determine how many bytes of data to read. */ - nRead = (int)(p->iEof - p->iReadOff); - if( nRead>p->nBuffer ) nRead = p->nBuffer; + if( (p->iEof - p->iReadOff) > (i64)p->nBuffer ){ + nRead = p->nBuffer; + }else{ + nRead = (int)(p->iEof - p->iReadOff); + } assert( nRead>0 ); /* Read data from the file. Return early if an error occurs. */ |