diff options
| author | drh <> | 2022-02-06 23:54:41 +0000 |
|---|---|---|
| committer | drh <> | 2022-02-06 23:54:41 +0000 |
| commit | 5d20a21814e57a707577e3ef8e275cf7465e0e7f (patch) | |
| tree | f34cd23a2a16cf36354798b49e213a5a05b056c8 /src/printf.c | |
| parent | 51896e6fd714769604a3f22cc564767aa5c0db48 (diff) | |
| download | sqlite-5d20a21814e57a707577e3ef8e275cf7465e0e7f.tar.gz sqlite-5d20a21814e57a707577e3ef8e275cf7465e0e7f.zip | |
Fix unreachable branches in the sqlite3_error_offset() logic.
FossilOrigin-Name: 031381aea371892a35737e550121846af41241711a36c1a2086af3b0c11bf7b6
Diffstat (limited to 'src/printf.c')
| -rw-r--r-- | src/printf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/printf.c b/src/printf.c index ef9f3f2b5..7bf6f2aeb 100644 --- a/src/printf.c +++ b/src/printf.c @@ -853,7 +853,7 @@ void sqlite3_str_vappendf( if( flag_alternateform ){ /* %#T means an Expr pointer that uses Expr.u.zToken */ Expr *pExpr = va_arg(ap,Expr*); - if( pExpr && ALWAYS(!ExprHasProperty(pExpr,EP_IntValue)) ){ + if( ALWAYS(pExpr) && ALWAYS(!ExprHasProperty(pExpr,EP_IntValue)) ){ sqlite3_str_appendall(pAccum, (const char*)pExpr->u.zToken); sqlite3RecordErrorOffsetOfExpr(pAccum->db, pExpr); } @@ -948,7 +948,6 @@ void sqlite3RecordErrorByteOffset(sqlite3 *db, const char *z){ ** as the error offset. */ void sqlite3RecordErrorOffsetOfExpr(sqlite3 *db, const Expr *pExpr){ - if( db->errByteOffset>=0 ) return; while( pExpr && (ExprHasProperty(pExpr,EP_FromJoin) || pExpr->w.iOfst<=0) ){ pExpr = pExpr->pLeft; } |