From a13638ed10eff960cebe88554bca48704a66a268 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 7 Sep 2023 13:53:09 +0000 Subject: Fix a buffer overread in the sessions extension that could occur when processing a corrupt changeset. FossilOrigin-Name: 0e4e7a05c4204b47a324d67e18e76d2a98e26b2723d19d5c655ec9fd2e41f4b7 --- ext/session/sqlite3session.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c index fd06f3b4d6..776797ff29 100644 --- a/ext/session/sqlite3session.c +++ b/ext/session/sqlite3session.c @@ -3050,15 +3050,19 @@ static int sessionReadRecord( } } if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){ - sqlite3_int64 v = sessionGetI64(aVal); - if( eType==SQLITE_INTEGER ){ - sqlite3VdbeMemSetInt64(apOut[i], v); + if( (pIn->nData-pIn->iNext)<8 ){ + rc = SQLITE_CORRUPT_BKPT; }else{ - double d; - memcpy(&d, &v, 8); - sqlite3VdbeMemSetDouble(apOut[i], d); + sqlite3_int64 v = sessionGetI64(aVal); + if( eType==SQLITE_INTEGER ){ + sqlite3VdbeMemSetInt64(apOut[i], v); + }else{ + double d; + memcpy(&d, &v, 8); + sqlite3VdbeMemSetDouble(apOut[i], d); + } + pIn->iNext += 8; } - pIn->iNext += 8; } } } -- 2.30.2