diff options
| author | drh <drh@noemail.net> | 2018-06-02 19:14:58 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2018-06-02 19:14:58 +0000 |
| commit | eb7df46e3203bb1fe1cfbd1c42c3af1a26a6ce6d (patch) | |
| tree | d7a46b2eca6bb8648dec5ac0a3c3529a57729ecd | |
| parent | 1fb7a60ca07bfb74d222330322acc772305c5951 (diff) | |
| parent | 5ba5f5b5d27d9daac87c438bc56ac9cc56796e07 (diff) | |
| download | sqlite-eb7df46e3203bb1fe1cfbd1c42c3af1a26a6ce6d.tar.gz sqlite-eb7df46e3203bb1fe1cfbd1c42c3af1a26a6ce6d.zip | |
Avoid using a misaligned pointer.
FossilOrigin-Name: 1ecb3aa13de5c8dc611b814ff34010de0bd90aae73d88aa37a59c4627be4cc2d
| -rw-r--r-- | manifest | 14 | ||||
| -rw-r--r-- | manifest.uuid | 2 | ||||
| -rw-r--r-- | src/btree.c | 6 |
3 files changed, 13 insertions, 9 deletions
@@ -1,5 +1,5 @@ -C Fix\sthe\susage\sof\sposix_fallocate()\sso\sthat\sit\scorrectly\sresponds\sto\nEINVAL\sreturns. -D 2018-06-02T19:01:54.408 +C Avoid\susing\sa\smisaligned\spointer. +D 2018-06-02T19:14:58.082 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da @@ -436,7 +436,7 @@ F src/auth.c a38f3c63c974787ecf75e3213f8cac6568b9a7af7591fb0372ec0517dd16dca8 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6 -F src/btree.c 8270813c8f0ca91b2802e88ded3755d04ee962a923d431c13bcb6cf3e0c18f63 +F src/btree.c 44405d03a05496e13b40b3a208bcf941c42c815da90d6ff4b04267a6985e5eb7 F src/btree.h 448f15b98ea85dcf7e4eb76f731cadb89636c676ad25dfaac6de77cd66556598 F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96 F src/build.c 5fc41458505331bfb0c175f40b9a13cb335f826bed3ae311aaae000c132d7b16 @@ -1730,8 +1730,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 3d5eae1c26353cdee89f31f1293b05c0edb494c775ba0912d9b4fda9ab0ef304 ab3a5539db82814cafb832cdaebd1e14566139306453ef9cdba6b244a994fe0b -R 64e7a20d51f9d1438ac9592daa9dd6bf -T +closed ab3a5539db82814cafb832cdaebd1e14566139306453ef9cdba6b244a994fe0b +P ce2c3e7a875ede4366c48660ae8239d2b74e5f690ad5059844a45f1164f41e61 1b807b51cdf455b4f54216b73fd22bbc90f94e24222401e045f88cfd27f487e3 +R 2db4b8b40a57a71d528932145db72c5a +T +closed 1b807b51cdf455b4f54216b73fd22bbc90f94e24222401e045f88cfd27f487e3 U drh -Z 8bf90c20199723dfc867a912d22476ec +Z 5a6c767d04a951cad28a5422f8a9694a diff --git a/manifest.uuid b/manifest.uuid index cb15120d4..e0a78a25f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ce2c3e7a875ede4366c48660ae8239d2b74e5f690ad5059844a45f1164f41e61
\ No newline at end of file +1ecb3aa13de5c8dc611b814ff34010de0bd90aae73d88aa37a59c4627be4cc2d
\ No newline at end of file diff --git a/src/btree.c b/src/btree.c index a73896e16..fb3b89fe1 100644 --- a/src/btree.c +++ b/src/btree.c @@ -864,7 +864,11 @@ static int btreeRestoreCursorPosition(BtCursor *pCur){ ** back to where it ought to be if this routine returns true. */ int sqlite3BtreeCursorHasMoved(BtCursor *pCur){ - return pCur->eState!=CURSOR_VALID; + assert( EIGHT_BYTE_ALIGNMENT(pCur) + || pCur==sqlite3BtreeFakeValidCursor() ); + assert( offsetof(BtCursor, eState)==0 ); + assert( sizeof(pCur->eState)==1 ); + return CURSOR_VALID != *(u8*)pCur; } /* |