File: Add-file-bounds-check-to-comment-parser.patch

package info (click to toggle)
openscad 2021.01-9
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 36,096 kB
  • sloc: cpp: 53,199; sh: 4,384; ansic: 4,382; python: 1,813; yacc: 853; javascript: 762; lex: 417; lisp: 163; xml: 127; makefile: 118
file content (27 lines) | stat: -rw-r--r-- 864 bytes parent folder | download | duplicates (3) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
 
From: Kristian Nielsen <knielsen@knielsen-hq.org>
Date: Sun, 9 Jan 2022 17:57:42 +0100
Subject: Add file bounds check to comment parser

Backported patch from upstream.

Origin: https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b
Bug: https://github.com/openscad/openscad/issues/4043
Bug-Debian: https://bugs.debian.org/1005641
Forwarded: not-needed
---
 src/comment.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/comment.cpp b/src/comment.cpp
index f02ad2c..1ce3ab5 100644
--- a/src/comment.cpp
+++ b/src/comment.cpp
@@ -92,7 +92,7 @@ static std::string getComment(const std::string &fulltext, int line)
 	}
 
 	int end = start + 1;
-	while (fulltext[end] != '\n') end++;
+	while (end < fulltext.size() && fulltext[end] != '\n') end++;
 
 	std::string comment = fulltext.substr(start, end - start);