third_party/sqlite/misalignment.patch - Issue 885473002: [sql] Rewrite sqlite patching "system".

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: third_party/sqlite/misalignment.patch

Issue 885473002: [sql] Rewrite sqlite patching "system". (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« third_party/sqlite/README.chromium ('K') | « third_party/sqlite/memcmp.patch ('k') | third_party/sqlite/misc.patch » ('j') | third_party/sqlite/patches/0008-Virtual-table-supporting-recovery-of-corrupted-datab.patch » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
	(Empty)
1 diff --git ext/fts2/fts2_icu.c ext/fts2/fts2_icu.c

2 index 6b9687e..a8b8359 100644

3 --- ext/fts2/fts2_icu.c

4 +++ ext/fts2/fts2_icu.c

5 @@ -118,15 +118,15 @@ static int icuOpen(

6 nChar = nInput+1;

7 pCsr = (IcuCursor *)sqlite3_malloc(

8 sizeof(IcuCursor) + /* IcuCursor */

9 - nChar * sizeof(UChar) + /* IcuCursor.aChar[] */

10 - (nChar+1) * sizeof(int) /* IcuCursor.aOffset[] */

11 + (nChar+1) * sizeof(int) + /* IcuCursor.aOffset[] */

12 + nChar * sizeof(UChar) /* IcuCursor.aChar[] */

13 );

14 if( !pCsr ){

15 return SQLITE_NOMEM;

16 }

17 memset(pCsr, 0, sizeof(IcuCursor));

18 - pCsr->aChar = (UChar *)&pCsr[1];

19 - pCsr->aOffset = (int *)&pCsr->aChar[nChar];

20 + pCsr->aOffset = (int *)&pCsr[1];

21 + pCsr->aChar = (UChar *)&pCsr->aOffset[nChar+1];

22

23 pCsr->aOffset[iOut] = iInput;

24 U8_NEXT(zInput, iInput, nInput, c);

25 diff --git ext/fts3/fts3_icu.c ext/fts3/fts3_icu.c

26 index a75b14a..e406168 100644

27 --- ext/fts3/fts3_icu.c

28 +++ ext/fts3/fts3_icu.c

29 @@ -118,15 +118,15 @@ static int icuOpen(

30 nChar = nInput+1;

31 pCsr = (IcuCursor *)sqlite3_malloc(

32 sizeof(IcuCursor) + /* IcuCursor */

33 - nChar * sizeof(UChar) + /* IcuCursor.aChar[] */

34 - (nChar+1) * sizeof(int) /* IcuCursor.aOffset[] */

35 + (nChar+1) * sizeof(int) + /* IcuCursor.aOffset[] */

36 + nChar * sizeof(UChar) /* IcuCursor.aChar[] */

37 );

38 if( !pCsr ){

39 return SQLITE_NOMEM;

40 }

41 memset(pCsr, 0, sizeof(IcuCursor));

42 - pCsr->aChar = (UChar *)&pCsr[1];

43 - pCsr->aOffset = (int *)&pCsr->aChar[nChar];

44 + pCsr->aOffset = (int *)&pCsr[1];

45 + pCsr->aChar = (UChar *)&pCsr->aOffset[nChar+1];

46

47 pCsr->aOffset[iOut] = iInput;

48 U8_NEXT(zInput, iInput, nInput, c);

OLD	NEW