fix integer overflow on gigabyte string

Signed-off-by: zwtmichael <zhuwentao5@huawei.com>
This commit is contained in:
zwtmichael 2022-09-06 10:50:06 +08:00
parent cc09bf633f
commit 2b83c6eeba
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,28 @@
From d409970d551d4cc9c8fc969cb3f39b0a2334841f Mon Sep 17 00:00:00 2001
From: zwtmichael <zhuwentao5@huawei.com>
Date: Tue, 6 Sep 2022 10:47:19 +0800
Subject: [PATCH] fix integer overflow on gigabyte string
Signed-off-by: zwtmichael <zhuwentao5@huawei.com>
---
src/printf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/printf.c b/src/printf.c
index ae95702..699bdb5 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -798,8 +798,8 @@ void sqlite3_str_vappendf(
case etSQLESCAPE: /* %q: Escape ' characters */
case etSQLESCAPE2: /* %Q: Escape ' and enclose in '...' */
case etSQLESCAPE3: { /* %w: Escape " characters */
- int i, j, k, n, isnull;
- int needQuote;
+ i64 i, j, k, n;
+ int needQuote, isnull;
char ch;
char q = ((xtype==etSQLESCAPE3)?'"':'\''); /* Quote character */
char *escarg;
--
2.25.1

View File

@ -7,7 +7,7 @@
Name: sqlite
Version: 3.32.3
Release: 5
Release: 6
Summary: Embeded SQL database
License: Public Domain
URL: http://www.sqlite.org/
@ -21,6 +21,7 @@ Patch2: 0002-remove-fail-testcase-in-no-free-fd-situation.patch
Patch3: CVE-2021-20227.patch
Patch4: 0004-CVE-2022-35737.patch
Patch5: 0005-CVE-2021-20223.patch
Patch6: 0006-fix-integer-overflow-on-gigabyte-string.patch
BuildRequires: gcc autoconf tcl tcl-devel
BuildRequires: ncurses-devel readline-devel glibc-devel
@ -68,6 +69,7 @@ This contains man files and HTML files for the using of sqlite.
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
rm -f %{name}-doc-%{extver}/sqlite.css~ || :
@ -140,6 +142,9 @@ make test
%{_mandir}/man*/*
%changelog
* Tue Sep 6 2022 zhuwentao <zhuwentao5@huawei.com> - 3.32.3-6
- fix integer overflow on gigabyte string
* Wed Aug 31 2022 wbq_sky<wangbingquan@huawei.com> - 3.32.3-5
- Fix CVE-2021-20223