mirror of https://github.com/sqlite/sqlite
Remove an unreachable branch in the error handling logic for
sqlite3BtreePayloadChecked(). FossilOrigin-Name: 293bf3ed7e40745349c83b202b27ed1b48517e1a
This commit is contained in:
parent
b7dab70a92
commit
945b094632
12
manifest
12
manifest
|
@ -1,5 +1,5 @@
|
||||||
C Improvement\sto\sthe\sOP_Permutation\sopcode\sto\sprevent\sit\sfrom\susing\sCPU\scycles\nfor\sinitialization\sin\sprepared\sstatements\sthat\sdo\snot\suse\sthat\sopcode.
|
C Remove\san\sunreachable\sbranch\sin\sthe\serror\shandling\slogic\sfor\nsqlite3BtreePayloadChecked().
|
||||||
D 2017-01-26T18:00:00.328
|
D 2017-01-26T21:30:00.788
|
||||||
F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
|
F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
|
||||||
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
|
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
|
||||||
F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
|
F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
|
||||||
|
@ -333,7 +333,7 @@ F src/auth.c 930b376a9c56998557367e6f7f8aaeac82a2a792
|
||||||
F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
|
F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
|
||||||
F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
|
F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
|
||||||
F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
|
F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
|
||||||
F src/btree.c 6fe6a5853148b623c4f5e288ae916180632ebbd3
|
F src/btree.c bd72bb69abc7f3f3513308b9dd3749194b5d66d1
|
||||||
F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
|
F src/btree.h e6d352808956ec163a17f832193a3e198b3fb0ac
|
||||||
F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
|
F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
|
||||||
F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
|
F src/build.c 9e799f1edd910dfa8a0bc29bd390d35d310596af
|
||||||
|
@ -1547,7 +1547,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||||
P b4803184652e5f4f823c1521412bc480baeb3dbf
|
P b4a98f65564a0d9fba2fef95ebd00a39b3e1e572
|
||||||
R 5d2cc4b6c4ee841c772ca9230a25766d
|
R 9abdd03cd61c16f0272c0fd74c72cba7
|
||||||
U drh
|
U drh
|
||||||
Z 39169c59805d0271c33a4d8ecd6430ca
|
Z 4b9455997c313589c1136c73cb07a07d
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
b4a98f65564a0d9fba2fef95ebd00a39b3e1e572
|
293bf3ed7e40745349c83b202b27ed1b48517e1a
|
|
@ -4683,7 +4683,7 @@ static SQLITE_NOINLINE int accessPayloadChecked(
|
||||||
return SQLITE_ABORT;
|
return SQLITE_ABORT;
|
||||||
}
|
}
|
||||||
assert( cursorOwnsBtShared(pCur) );
|
assert( cursorOwnsBtShared(pCur) );
|
||||||
rc = restoreCursorPosition(pCur);
|
rc = btreeRestoreCursorPosition(pCur);
|
||||||
return rc ? rc : accessPayload(pCur, offset, amt, pBuf, 0);
|
return rc ? rc : accessPayload(pCur, offset, amt, pBuf, 0);
|
||||||
}
|
}
|
||||||
int sqlite3BtreePayloadChecked(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){
|
int sqlite3BtreePayloadChecked(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){
|
||||||
|
|
Loading…
Reference in New Issue