From 642d7c051ec7a5254737108f2967942a0125663f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 12 Jul 2017 20:48:16 -0700 Subject: [PATCH] tests: Avoid failure based on encoding name differences. glibc and Mac OS X call the ASCII encoding by different names, which caused differing output and a test failure. This fixes the problem. Reported by Jeremy Lavergne. --- tests/data/sys-file-reader.at | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/data/sys-file-reader.at b/tests/data/sys-file-reader.at index e23917884e..669ed5b969 100644 --- a/tests/data/sys-file-reader.at +++ b/tests/data/sys-file-reader.at @@ -3896,9 +3896,9 @@ AT_CLEANUP # See also https://security-tracker.debian.org/tracker/CVE-2017-10791. # Found by team OWL337, using the collAFL fuzzer. AT_SETUP([integer overflows in long string missing values]) +AT_KEYWORDS([system file negative]) cp $top_srcdir/tests/data/CVE-2017-10791.sav . -AT_CHECK([pspp-convert -O csv CVE-2017-10791.sav -], [0], [], [dnl -`CVE-2017-10791.sav': This system file does not indicate its own character encoding. Using default encoding ANSI_X3.4-1968. For best results, specify an encoding explicitly. Use SYSFILE INFO with ENCODING="DETECT" to analyze the possible encodings. +AT_CHECK([pspp-convert -O csv -e ASCII CVE-2017-10791.sav -], [0], [], [dnl `CVE-2017-10791.sav' near offset 0x217: Extension record subtype 21 ends unexpectedly. ]) AT_CLEANUP @@ -3909,9 +3909,9 @@ AT_CLEANUP # See also https://security-tracker.debian.org/tracker/CVE-2017-10792. # Reported by team OWL337, with fuzzer collAFL. AT_SETUP([null dereference skipping bad extension record 18]) +AT_KEYWORDS([system file negative]) cp $top_srcdir/tests/data/CVE-2017-10792.sav . -AT_CHECK([pspp-convert -O csv CVE-2017-10792.sav -], [0], [], [dnl +AT_CHECK([pspp-convert -O csv -e ASCII CVE-2017-10792.sav -], [0], [], [dnl `CVE-2017-10792.sav' near offset 0x1c0: Record type 7, subtype 18 has bad size 4 (expected 1). -`CVE-2017-10792.sav': This system file does not indicate its own character encoding. Using default encoding ANSI_X3.4-1968. For best results, specify an encoding explicitly. Use SYSFILE INFO with ENCODING="DETECT" to analyze the possible encodings. ]) AT_CLEANUP -- 2.30.2