system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 10:48:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

hexdump: Partial lines cannot be repetitions of earlier lines.

Browse source 
When checking for repetitions of earlier lines, we compare the
first nread bytes of the line against the saved line. However,
when we read a partial line, it should never be treated as a
repetition of an earlier line, even if the first bytes match.

This change fixes a bug where a partial line could be
incorrectly identified as a repetition of an earlier line.

Reported-by:	Mark Adler <madler@alumni.caltech.edu>
PR:		118723
Reviewed-by:	emaste
MFC-after:	2 weeks
Differential Revision: https://reviews.freebsd.org/D40471
This commit is contained in:
Xin LI 2023-06-08 18:38:47 -07:00
parent cbbac56091
commit d101656818
6 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr.bin/hexdump/display.c
View file

@ -271,7 +271,7 @@ get(void)
* XXX bcmp() is not quite right in the presence
* of multibyte characters.
*/
if (vflag != ALL &&
if (need == 0 && vflag != ALL &&
valid_save &&
bcmp(curp, savp, nread) == 0) {
if (vflag != DUP) {

3
usr.bin/hexdump/tests/Makefile
View file

@ -7,6 +7,7 @@ ATF_TESTS_SH= hexdump_test od_test
${PACKAGE}FILES+= d_hexdump_a.in
${PACKAGE}FILES+= d_hexdump_b.in
${PACKAGE}FILES+= d_hexdump_c.in
${PACKAGE}FILES+= d_hexdump_bug118723.in
${PACKAGE}FILES+= d_hexdump_bflag_a.out
${PACKAGE}FILES+= d_hexdump_bflag_b.out
${PACKAGE}FILES+= d_hexdump_bflag_c.out
@ -30,6 +31,8 @@ ${PACKAGE}FILES+= d_hexdump_sflag_a.out
${PACKAGE}FILES+= d_hexdump_UCflag_a.out
${PACKAGE}FILES+= d_hexdump_UCflag_b.out
${PACKAGE}FILES+= d_hexdump_UCflag_c.out
${PACKAGE}FILES+= d_hexdump_UCflag_bug118723.out
${PACKAGE}FILES+= d_hexdump_UCvflag_bug118723.out
${PACKAGE}FILES+= d_hexdump_xflag_a_el.out
${PACKAGE}FILES+= d_hexdump_xflag_b_el.out
${PACKAGE}FILES+= d_hexdump_xflag_c_el.out

4
usr.bin/hexdump/tests/d_hexdump_UCflag_bug118723.out Normal file
View file

@ -0,0 +1,4 @@
00000000 61 62 63 64 65 66 67 0a 30 31 32 33 34 35 36 0a |abcdefg.0123456.|
*
00000020 61 62 63 64 65 66 67 0a |abcdefg.|
00000028

4
usr.bin/hexdump/tests/d_hexdump_UCvflag_bug118723.out Normal file
View file

@ -0,0 +1,4 @@
00000000 61 62 63 64 65 66 67 0a 30 31 32 33 34 35 36 0a |abcdefg.0123456.|
00000010 61 62 63 64 65 66 67 0a 30 31 32 33 34 35 36 0a |abcdefg.0123456.|
00000020 61 62 63 64 65 66 67 0a |abcdefg.|
00000028

5
usr.bin/hexdump/tests/d_hexdump_bug118723.in Normal file
View file

@ -0,0 +1,5 @@
abcdefg
0123456
abcdefg
0123456
abcdefg

8
usr.bin/hexdump/tests/hexdump_test.sh
View file

@ -75,6 +75,10 @@ C_flag_body()
hexdump -C "$(atf_get_srcdir)/d_hexdump_b.in"
atf_check -o file:"$(atf_get_srcdir)/d_hexdump_UCflag_c.out" \
hexdump -C "$(atf_get_srcdir)/d_hexdump_c.in"
atf_check -o file:"$(atf_get_srcdir)/d_hexdump_UCflag_bug118723.out" \
hexdump -C "$(atf_get_srcdir)/d_hexdump_bug118723.in"
atf_check -o file:"$(atf_get_srcdir)/d_hexdump_UCvflag_bug118723.out" \
hexdump -Cv "$(atf_get_srcdir)/d_hexdump_bug118723.in"
}
atf_test_case hd_name
@ -90,6 +94,10 @@ hd_name_body()
hd "$(atf_get_srcdir)/d_hexdump_b.in"
atf_check -o file:"$(atf_get_srcdir)/d_hexdump_UCflag_c.out" \
hd "$(atf_get_srcdir)/d_hexdump_c.in"
atf_check -o file:"$(atf_get_srcdir)/d_hexdump_UCflag_bug118723.out" \
hd "$(atf_get_srcdir)/d_hexdump_bug118723.in"
atf_check -o file:"$(atf_get_srcdir)/d_hexdump_UCvflag_bug118723.out" \
hd -v "$(atf_get_srcdir)/d_hexdump_bug118723.in"
}
atf_test_case d_flag