mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an assert() in the merge-sort logic to account for I/O errors.

Browse Source 
FossilOrigin-Name: c1daa809a17a97610e51f9babd90f36908921245
This commit is contained in:
drh 2011-08-15 15:37:15 +00:00
parent 96e5088cda
commit 71ec5078c4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C New\smakefile\starget\s"sqlite3-debug.c"\sbuilds\san\samalgamation\sthat\sinclude\nappropriate\s"#line"\smacros\srelating\sthe\scode\sback\sto\sthe\soriginal\ssource\nfiles.
D 2011-08-15T15:27:20.505
C Fix\san\sassert()\sin\sthe\smerge-sort\slogic\sto\saccount\sfor\sI/O\serrors.
D 2011-08-15T15:37:15.493
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 8c930e7b493d59099ea1304bd0f2aed152eb3315
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -245,7 +245,7 @@ F src/vdbeapi.c 11dc47987abacb76ad016dcf5abc0dc422482a98
F src/vdbeaux.c 8fb978eb73a97b34d352dd3ef3bff35b1b3fa7e9
F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
F src/vdbesort.c 18e27c404df77c1834cc8d50d8853d77e3d32174
F src/vdbesort.c af82a8b0d0dbf67f8b03d9a70d3d6fcd3bdf83ba
F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
F src/vtab.c 901791a47318c0562cd0c676a2c6ff1bc530e582
F src/wal.c 3154756177d6219e233d84291d5b05f4e06ff5e9
@ -960,7 +960,7 @@ F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings.sh 2ebae31e1eb352696f3c2f7706a34c084b28c262
P bd04756b66e343a7bc6c8bbed9e5cff7b9658d01
R 3e390b4e6712a64b736c2b0c9c3fb839
P 26f2da24b080bf89e3574bd1a162eb1fead51456
R 4dd13a8266a17ee7b649184b6349eea5
U drh
Z e6b5de92686bece5cc2f1b4147f8ff82
Z 269571d9db3b50ac39e22f789db49cad

2
manifest.uuid
View File

@ -1 +1 @@
26f2da24b080bf89e3574bd1a162eb1fead51456
c1daa809a17a97610e51f9babd90f36908921245

2
src/vdbesort.c
View File

@ -541,7 +541,7 @@ static int vdbeSorterInitMerge(
VdbeSorterIter *pIter = &pSorter->aIter[i];
rc = vdbeSorterIterInit(db, pSorter, pSorter->iReadOff, pIter, &nByte);
pSorter->iReadOff = pIter->iEof;
assert( pSorter->iReadOff<=pSorter->iWriteOff );
assert( pSorter->iReadOff<=pSorter->iWriteOff || rc!=SQLITE_OK );
if( pSorter->iReadOff>=pSorter->iWriteOff ) break;
}