From 38f6519eac4e40c4b54c91d5c444afe4404dd662 Mon Sep 17 00:00:00 2001 From: "@ran-zhao-yu" Date: Wed, 18 Sep 2024 10:10:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E8=A1=A5out-of-bounds=20read?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: @ran-zhao-yu --- Fix.patch | 0 install.py | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 Fix.patch diff --git a/Fix.patch b/Fix.patch new file mode 100644 index 0000000..e69de29 diff --git a/install.py b/install.py index 129700f..431508a 100755 --- a/install.py +++ b/install.py @@ -50,7 +50,8 @@ def do_patch(args, target_dir): patch_file = [ "Fix error whenparses the value of 5E-324 with libc++.patch", "0001-Parse-large-floats-as-infinity-1349-1353.patch", - "0001-Use-default-rather-than-hard-coded-8-for-maximum-agg.patch" + "0001-Use-default-rather-than-hard-coded-8-for-maximum-agg.patch", + "Fix.patch" ] for patch in patch_file: -- Gitee From 87868510104c0cad1823534926f17e1ad95e0f6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=89=E5=8F=AC=E5=AE=87?= Date: Wed, 18 Sep 2024 02:19:36 +0000 Subject: [PATCH 2/4] update Fix.patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冉召宇 --- Fix.patch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Fix.patch b/Fix.patch index e69de29..6d97931 100644 --- a/Fix.patch +++ b/Fix.patch @@ -0,0 +1,21 @@ +diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp +--- a/src/lib_json/json_reader.cpp ++++ b/src/lib_json/json_reader.cpp +@@ -773,7 +773,7 @@ + while (current < location && current != end_) { + Char c = *current++; + if (c == '\r') { +- if (*current == '\n') ++ if (current != end_ && *current == '\n') + ++current; + lastLineStart = current; + ++line; +@@ -1826,7 +1826,7 @@ + while (current < location && current != end_) { + Char c = *current++; + if (c == '\r') { +- if (*current == '\n') ++ if (current != end_ && *current == '\n') + ++current; + lastLineStart = current; + ++line; -- Gitee From 87ebbfad9c9e5af346f3aa64389cbc0f2ba15d3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=89=E5=8F=AC=E5=AE=87?= Date: Wed, 18 Sep 2024 02:20:19 +0000 Subject: [PATCH 3/4] rename Fix.patch to Fix out-of-bounds read.patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冉召宇 --- Fix.patch => Fix out-of-bounds read.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Fix.patch => Fix out-of-bounds read.patch (100%) diff --git a/Fix.patch b/Fix out-of-bounds read.patch similarity index 100% rename from Fix.patch rename to Fix out-of-bounds read.patch -- Gitee From 7b50ac2bf518c94669f449514145609218efc618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=89=E5=8F=AC=E5=AE=87?= Date: Wed, 18 Sep 2024 02:20:36 +0000 Subject: [PATCH 4/4] update install.py. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 冉召宇 --- install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.py b/install.py index 431508a..31c7ad4 100755 --- a/install.py +++ b/install.py @@ -51,7 +51,7 @@ def do_patch(args, target_dir): "Fix error whenparses the value of 5E-324 with libc++.patch", "0001-Parse-large-floats-as-infinity-1349-1353.patch", "0001-Use-default-rather-than-hard-coded-8-for-maximum-agg.patch", - "Fix.patch" + "Fix out-of-bounds read.patch" ] for patch in patch_file: -- Gitee