commit 3c2205cd97838d3c4143107992967e23f0c958b8
author vslashg <veloso@verylowsodium.com> Mon Sep 09 20:32:17 2024 -0400
committer GitHub <noreply@github.com> Mon Sep 09 17:32:17 2024 -0700
tree e8b4667fa37c8bcce6fb758f8fcda7ae1ebbec94
parent 0a9b9d9c6ea04847af83c32930176ec42ba6c842

Fix out-of-bounds read. (#1503)

getLocationLIneAndColumn would read past the end of the provided buffer if generating an error message at the end of the stream, if the final character was `\r`.

Co-authored-by: Jordan Bayles <bayles.jordan@gmail.com>

src/lib_json/json_reader.cpp

diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
index b12c6b8..86ed030 100644
--- a/src/lib_json/json_reader.cpp
+++ b/src/lib_json/json_reader.cpp
@@ -761,7 +761,7 @@
   while (current < location && current != end_) {
     Char c = *current++;
     if (c == '\r') {
-      if (*current == '\n')
+      if (current != end_ && *current == '\n')
         ++current;
       lastLineStart = current;
       ++line;
@@ -1801,7 +1801,7 @@
   while (current < location && current != end_) {
     Char c = *current++;
     if (c == '\r') {
-      if (*current == '\n')
+      if (current != end_ && *current == '\n')
         ++current;
       lastLineStart = current;
       ++line;