Merge pull request json-c#739 from rouault/avoid_unsigned_integer_overflow

hawicz · web-flow · commit 66cce0a1d7ec · 2022-02-18T20:21:18.000-05:00
json_escape_str(): avoid harmless unsigned integer overflow
diff --git a/json_object.c b/json_object.c
@@ -180,8 +180,9 @@ static int json_escape_str(struct printbuf *pb, const char *str, size_t len, int
 {
 	size_t pos = 0, start_offset = 0;
 	unsigned char c;
-	while (len--)
+	while (len)
 	{
+		--len;
 		c = str[pos];
 		switch (c)
 		{

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,9 @@ static int json_escape_str(struct printbuf pb, const char str, size_t len, int`
`180`	`180`	`{`
`181`	`181`	`size_t pos = 0, start_offset = 0;`
`182`	`182`	`unsigned char c;`
`183`		`- while (len--)`
	`183`	`+ while (len)`
`184`	`184`	`{`
	`185`	`+ --len;`
`185`	`186`	`c = str[pos];`
`186`	`187`	`switch (c)`
`187`	`188`	`{`