35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
|
From c5c8e025ff6cf0f7400b17aec73014e9cdc00935 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zwtmichael <zhuwentao5@huawei.com>
|
||
|
|
Date: Mon, 7 Aug 2023 15:10:32 +0800
|
||
|
|
Subject: [PATCH] fix segmentation violation
|
||
|
|
|
||
|
|
Reference:https://gitee.com/src-openeuler/sqlite/blob/openEuler-22.03-LTS-SP3/0007-CVE-2023-36191.patch
|
||
|
|
Conflict:context adaptation
|
||
|
|
|
||
|
|
Signed-off-by: zwtmichael <zhuwentao5@huawei.com>
|
||
|
|
---
|
||
|
|
src/shell.c.in | 8 ++++++--
|
||
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/shell.c.in b/src/shell.c.in
|
||
|
|
index 72e4498..355b4bb 100644
|
||
|
|
--- a/src/shell.c.in
|
||
|
|
+++ b/src/shell.c.in
|
||
|
|
@@ -12219,8 +12219,12 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
|
||
|
|
}else if( cli_strcmp(z,"-bail")==0 ){
|
||
|
|
bail_on_error = 1;
|
||
|
|
}else if( cli_strcmp(z,"-nonce")==0 ){
|
||
|
|
- free(data.zNonce);
|
||
|
|
- data.zNonce = strdup(argv[++i]);
|
||
|
|
+ if( data.zNonce ) free(data.zNonce);
|
||
|
|
+ if( i + 1 < argc ) data.zNonce = strdup(argv[++i]);
|
||
|
|
+ else{
|
||
|
|
+ data.zNonce = 0;
|
||
|
|
+ break;
|
||
|
|
+ }
|
||
|
|
}else if( cli_strcmp(z,"-unsafe-testing")==0 ){
|
||
|
|
ShellSetFlag(&data,SHFLG_TestingMode);
|
||
|
|
}else if( cli_strcmp(z,"-safe")==0 ){
|
||
|
|
--
|
||
|
|
2.33.0
|