b3b1fcc0b6
Signed-off-by: Wang_M <815543835@qq.com> Signed-off-by: Wang_M <815543835@qq.com> Signed-off-by: Wang_M <815543835@qq.com>
47 lines
1.4 KiB
Diff
47 lines
1.4 KiB
Diff
From 310e27eec4eb0e6c5cbc7bad6d3c0ad71619cb44 Mon Sep 17 00:00:00 2001
|
|
From: dan <Dan Kennedy>
|
|
Date: Thu, 7 Sep 2023 13:53:09 +0000
|
|
Subject: [PATCH] Fix a buffer overread in the sessions extension that could
|
|
occur when processing a corrupt changeset.
|
|
|
|
Reference:https://sqlite.org/src/info/0e4e7a05c4204b47
|
|
Conflict:NA
|
|
|
|
---
|
|
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 a892804..72ad427 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.33.0
|