Merge pull request #427 from bazsi/cfg-source-fix-lines-array-overflow

OverOrion · web-flow · commit 99abe6abdf5c · 2025-01-02T10:35:31.000+01:00
cfg-source: avoid indexing over the end of the lines array
diff --git a/lib/cfg-source.c b/lib/cfg-source.c
@@ -237,7 +237,7 @@ _extract_source_from_buffer_location(GString *result, const gchar *buffer_conten
   if (yylloc->first_column < 1)
     goto exit;
 
-  for (gint lineno = yylloc->first_line; lineno <= yylloc->last_line; lineno++)
+  for (gint lineno = yylloc->first_line; lineno < num_lines && lineno <= yylloc->last_line; lineno++)
     {
       gchar *line = lines[lineno - 1];
       gint linelen = strlen(line);

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ _extract_source_from_buffer_location(GString result, const gchar buffer_conten`
`237`	`237`	`if (yylloc->first_column < 1)`
`238`	`238`	`goto exit;`
`239`	`239`
`240`		`- for (gint lineno = yylloc->first_line; lineno <= yylloc->last_line; lineno++)`
	`240`	`+ for (gint lineno = yylloc->first_line; lineno < num_lines && lineno <= yylloc->last_line; lineno++)`
`241`	`241`	`{`
`242`	`242`	`gchar *line = lines[lineno - 1];`
`243`	`243`	`gint linelen = strlen(line);`