Add boundary check to avoid cross the border

Signed-off-by: N fangyunzhong <fangyunzhong2@huawei.com>

Add boundary check to avoid cross the border
Signed-off-by: N fangyunzhong <fangyunzhong2@huawei.com>
e3a2be37 · fangyunzhong · 0f542451 · e3a2be37
显示空白变更内容
内联并排

Showing with 8 addition and 0 deletion

src/lib_json/json_reader.cpp src/lib_json/json_reader.cpp +8 -0

未找到文件。
--- a/src/lib_json/json_reader.cpp
+++ b/src/lib_json/json_reader.cpp
@@ -772,6 +772,10 @@ void Reader::getLocationLineAndColumn(Location location, int& line,
  while (current < location && current != end_) {
    Char c = *current++;
    if (c == '\r') {
+      // Add boundary check to avoid cross the border
+      if (current == end_) {
+        break;
+      }
      if (*current == '\n')
        ++current;
      lastLineStart = current;
@@ -1838,6 +1842,10 @@ void OurReader::getLocationLineAndColumn(Location location, int& line,
  while (current < location && current != end_) {
    Char c = *current++;
    if (c == '\r') {
+      // Add boundary check to avoid cross the border
+      if (current == end_) {
+        break;
+      }
      if (*current == '\n')
        ++current;
      lastLineStart = current;