diff options
| author | dan <dan@noemail.net> | 2015-01-01 18:03:49 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-01-01 18:03:49 +0000 |
| commit | 37db72f1f7ca41c61b1c084bdb75f3111ceba6f8 (patch) | |
| tree | 5a01dcb28b6513353a64e93b11d6243845e69bc7 /src/complete.c | |
| parent | 6024772ba292a9abc6810dd0b12767d02b47ccf1 (diff) | |
| parent | a0de826c9ff84bd19de76ebbc0d4bdafa9686d3a (diff) | |
| download | sqlite-37db72f1f7ca41c61b1c084bdb75f3111ceba6f8.tar.gz sqlite-37db72f1f7ca41c61b1c084bdb75f3111ceba6f8.zip | |
Merge latest trunk changes with this branch.
FossilOrigin-Name: 4b3651677e7132c4c45605bc1f216fc08ef31198
Diffstat (limited to 'src/complete.c')
| -rw-r--r-- | src/complete.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/complete.c b/src/complete.c index 9e9140085..f7a35cc6f 100644 --- a/src/complete.c +++ b/src/complete.c @@ -70,7 +70,7 @@ extern const char sqlite3IsEbcdicIdChar[]; ** a statement. ** ** (4) CREATE The keyword CREATE has been seen at the beginning of a -** statement, possibly preceeded by EXPLAIN and/or followed by +** statement, possibly preceded by EXPLAIN and/or followed by ** TEMP or TEMPORARY ** ** (5) TRIGGER We are in the middle of a trigger definition that must be @@ -80,7 +80,7 @@ extern const char sqlite3IsEbcdicIdChar[]; ** the end of a trigger definition. ** ** (7) END We've seen the ";END" of the ";END;" that occurs at the end -** of a trigger difinition. +** of a trigger definition. ** ** Transitions between states above are determined by tokens extracted ** from the input. The following tokens are significant: @@ -123,7 +123,7 @@ int sqlite3_complete(const char *zSql){ }; #else /* If triggers are not supported by this compile then the statement machine - ** used to detect the end of a statement is much simplier + ** used to detect the end of a statement is much simpler */ static const u8 trans[3][3] = { /* Token: */ @@ -134,6 +134,13 @@ int sqlite3_complete(const char *zSql){ }; #endif /* SQLITE_OMIT_TRIGGER */ +#ifdef SQLITE_ENABLE_API_ARMOR + if( zSql==0 ){ + (void)SQLITE_MISUSE_BKPT; + return 0; + } +#endif + while( *zSql ){ switch( *zSql ){ case ';': { /* A semicolon */ |