database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-11 01:42:22 +03:00
Code Activity

Fix an incorrect assert() in the sqlite3_trace() logic.

Browse Source 
FossilOrigin-Name: eabde33997b5b2ffc0067930305d6fed5951a234
This commit is contained in:
drh
2015-04-18 00:22:17 +00:00
parent 1586699cfc
commit c982844097
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sa\sproblem\saffecting\ssome\sfts3\sUPDATE\sand\sDELETE\sstatements\son\sorder=DESC\stables.
D 2015-04-17T20:51:55.807
C Fix\san\sincorrect\sassert()\sin\sthe\ssqlite3_trace()\slogic.
D 2015-04-18T00:22:17.023
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in faaf75b89840659d74501bea269c7e33414761c1
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -301,7 +301,7 @@ F src/vdbeaux.c 03591cca98ec50e1493043f0ff7abbece0b9c83d
F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
F src/vdbemem.c c0dc81285b7571b0a31c40f17846fe2397ec1cd9
F src/vdbesort.c 2e7f683464fd5db3be4beaa1ff2d39e24fcb64b8
F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
F src/vdbetrace.c e41a50837d694ddd8434533964058e82f0ee7288
F src/vtab.c 9ca557215e8591ceb66e0b7c0a579c6df1e54b2d
F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
F src/wal.c 753995db83247f20361a8e8a874990b21a75abd9
@@ -1251,7 +1251,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P b67bb16c72c3e015ea82665ada9b5d3289ef6fb2
R e2e6547f1f65a23306e35eed7a1b5202
U dan
Z 1c324a552a5080240054761e4e92cb4f
P 284c1623f81704ef80edb9324954525cb2b72172
R b9c1303fd29cc013899d58614b64ee34
U drh
Z 1ad4f2ae3e13af8994ef4437fb3cca3c

2
manifest.uuid
View File

@@ -1 +1 @@
284c1623f81704ef80edb9324954525cb2b72172
eabde33997b5b2ffc0067930305d6fed5951a234

4
src/vdbetrace.c
View File

@@ -111,10 +111,12 @@ char *sqlite3VdbeExpandSql(
idx = nextIndex;
}
}else{
assert( zRawSql[0]==':' || zRawSql[0]=='$' || zRawSql[0]=='@' );
assert( zRawSql[0]==':' || zRawSql[0]=='$' ||
zRawSql[0]=='@' || zRawSql[0]=='#' );
testcase( zRawSql[0]==':' );
testcase( zRawSql[0]=='$' );
testcase( zRawSql[0]=='@' );
testcase( zRawSql[0]=='#' );
idx = sqlite3VdbeParameterIndex(p, zRawSql, nToken);
assert( idx>0 );
}