ptx: fix an invalid heap reference with short --width

* src/ptx.c (fix_output_parameters): Ensure line_width doesn't
go negative, which can happen when the --width is less
than the --gap-size.
* tests/misc/ptx-overrun.sh: Add a test case that triggers
with ASAN.  (Note the longer filename is needed to trigger).
Fixes http://bugs.gnu.org/25011
This commit is contained in:
Pádraig Brady committed 2016-11-24 16:21:59 +00:00
1 parent 19157e87fd
commit ca99c524e8
2 files changed
+7

No files matched your search

+2
View File
@@ -1235,6 +1235,8 @@ fix_output_parameters (void)
if ((auto_reference || input_reference) && !right_reference)
line_width -= reference_max_width + gap_size;
if (line_width < 0)
line_width = 0;
/* The output lines, minimally, will contain from left to right a left
context, a gap, and a keyword followed by the right context with no
+5
View File
@@ -41,4 +41,9 @@ ptx ws.in ws.in | sort | uniq -u > out
compare /dev/null out || fail=1
# Trigger an invalid heap reference noticed by gcc -fsanitize=address
# from coreutils-8.25 and earlier.
echo a > a
ptx -w1 -A $PWD/a >/dev/null || fail=1
Exit $fail