diff options
| author | drh <drh@noemail.net> | 2008-07-08 19:34:06 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2008-07-08 19:34:06 +0000 |
| commit | f089aa459e97f6f8ed27efdc958e8ee642b0b4bb (patch) | |
| tree | 345a713531ba65de2f6888ed1b76fafd5fb1dda8 /src/tokenize.c | |
| parent | 0880a7463364f3fd0428c8457c89c5fefae977ea (diff) | |
| download | sqlite-f089aa459e97f6f8ed27efdc958e8ee642b0b4bb.tar.gz sqlite-f089aa459e97f6f8ed27efdc958e8ee642b0b4bb.zip | |
Completely rework the sqlite3SetString() primitive so that it honors the
SQLITE_LIMIT_LENGTH and avoids the use of strlen(). (CVS 5374)
FossilOrigin-Name: 8ed04b1e26a55306e4baf3e93fb084514134d603
Diffstat (limited to 'src/tokenize.c')
| -rw-r--r-- | src/tokenize.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tokenize.c b/src/tokenize.c index 05622dae1..c7769f97f 100644 --- a/src/tokenize.c +++ b/src/tokenize.c @@ -15,7 +15,7 @@ ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. ** -** $Id: tokenize.c,v 1.145 2008/07/08 00:06:50 drh Exp $ +** $Id: tokenize.c,v 1.146 2008/07/08 19:34:07 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -421,7 +421,7 @@ int sqlite3RunParser(Parse *pParse, const char *zSql, char **pzErrMsg){ case TK_COMMENT: { if( db->u1.isInterrupted ){ pParse->rc = SQLITE_INTERRUPT; - sqlite3SetString(pzErrMsg, "interrupt", (char*)0); + sqlite3SetString(pzErrMsg, db, "interrupt"); goto abort_parse; } break; @@ -460,7 +460,7 @@ abort_parse: pParse->rc = SQLITE_NOMEM; } if( pParse->rc!=SQLITE_OK && pParse->rc!=SQLITE_DONE && pParse->zErrMsg==0 ){ - sqlite3SetString(&pParse->zErrMsg, sqlite3ErrStr(pParse->rc), (char*)0); + sqlite3SetString(&pParse->zErrMsg, db, "%s", sqlite3ErrStr(pParse->rc)); } if( pParse->zErrMsg ){ if( *pzErrMsg==0 ){ |