libcpp: Fix overly large buffer allocation

Lewis Hyatt · Lewis Hyatt · commit 27af1a14f3a0 · 2024-12-23T20:24:30.000-05:00
It seems that tokens_buff_new() has always been allocating the virtual
location buffer 4 times larger than intended, and now that location_t is
64-bit, it is 8 times larger. Fixed.

libcpp/ChangeLog:

	* macro.cc (tokens_buff_new): Fix length argument to XNEWVEC.
diff --git a/libcpp/macro.cc b/libcpp/macro.cc
@@ -2579,10 +2579,8 @@ tokens_buff_new (cpp_reader *pfile, size_t len,
 		 location_t **virt_locs)
 {
   size_t tokens_size = len * sizeof (cpp_token *);
-  size_t locs_size = len * sizeof (location_t);
-
   if (virt_locs != NULL)
-    *virt_locs = XNEWVEC (location_t, locs_size);
+    *virt_locs = XNEWVEC (location_t, len);
   return _cpp_get_buff (pfile, tokens_size);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2579,10 +2579,8 @@ tokens_buff_new (cpp_reader *pfile, size_t len,`
`2579`	`2579`	`location_t **virt_locs)`
`2580`	`2580`	`{`
`2581`	`2581`	`size_t tokens_size = len * sizeof (cpp_token *);`
`2582`		`- size_t locs_size = len * sizeof (location_t);`
`2583`		`-`
`2584`	`2582`	`if (virt_locs != NULL)`
`2585`		`- *virt_locs = XNEWVEC (location_t, locs_size);`
	`2583`	`+ *virt_locs = XNEWVEC (location_t, len);`
`2586`	`2584`	`return _cpp_get_buff (pfile, tokens_size);`
`2587`	`2585`	`}`
`2588`	`2586`