[libexif-cvs] libexif-testsuite/tests 3434540.jpg, NONE, 1.1 3434545.jpg, NONE, 1.1 check-3434540.sh, NONE, 1.1 check-3434545.sh, NONE, 1.1 check-cve-2012-2812.sh, NONE, 1.1 check-cve-2012-2813.sh, NONE, 1.1 check-cve-2012-2814.sh, NONE, 1.1 cve-2012-2812.jpg, NONE, 1.1 cve-2012-2813.jpg, NONE, 1.1 cve-2012-2814.jpg, NONE, 1.1 Makefile.am, 1.33, 1.34 image-info.sh, 1.4, 1.5

[Dan F. <dfa...@us...>]

Update of /cvsroot/libexif/libexif-testsuite/tests
In directory vz-cvs-4.sog:/tmp/cvs-serv30544/tests

Modified Files:
	Makefile.am image-info.sh 
Added Files:
	3434540.jpg 3434545.jpg check-3434540.sh check-3434545.sh 
	check-cve-2012-2812.sh check-cve-2012-2813.sh 
	check-cve-2012-2814.sh cve-2012-2812.jpg cve-2012-2813.jpg 
	cve-2012-2814.jpg 
Log Message:
Added check-3434540.sh check-3434545.sh check-cve-2012-2812.sh
check-cve-2012-2813.sh check-cve-2012-2814.sh to check for various
problems fixed in libexif ver. 0.6.21; many of these require
valgrind or similar memory checking tools to detect the issues


--- NEW FILE: 3434540.jpg ---
(This appears to be a binary file; contents omitted.)

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Makefile.am	8 Oct 2010 05:22:03 -0000	1.33
+++ Makefile.am	13 Jul 2012 15:05:51 -0000	1.34
@@ -23,7 +23,12 @@
 	check-1054322.sh 1054322.jpg \
 	check-1054323.sh 1054323.jpg \
 	check-1169170.sh \
+	check-3434540.sh 3434540.jpg \
+	check-3434545.sh 3434545.jpg \
 	check-bid37022.sh bid37022.jpg \
+	check-cve-2012-2812.sh cve-2012-2812.jpg \
+	check-cve-2012-2813.sh cve-2012-2813.jpg \
+	check-cve-2012-2814.sh cve-2012-2814.jpg \
 	check-tag-description.sh \
 	check-add-tags.sh \
 	check-create-tags.sh \
@@ -42,7 +47,12 @@
 	check-1054322.sh \
 	check-1054323.sh \
 	check-1169170.sh \
+	check-3434540.sh \
+	check-3434545.sh \
 	check-bid37022.sh \
+	check-cve-2012-2812.sh \
+	check-cve-2012-2813.sh \
+	check-cve-2012-2814.sh \
 	check-tag-description.sh \
 	check-add-tags.sh \
 	check-create-tags.sh \

--- NEW FILE: cve-2012-2812.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cve-2012-2814.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: check-cve-2012-2812.sh ---
#!/bin/sh
# Tests for buffer overrun on corrupted Copyright tag
# This tests bug CVE-2012-2812
. ./check-vars.sh
$EXIFEXE -m --show-mnote "$SRCDIR"/cve-2012-2812.jpg > /dev/null 2>&1
# When run in a memory checking environment like valgrind, it will show
# an invalid memory access.

--- NEW FILE: check-cve-2012-2814.sh ---
#!/bin/sh
# Tests for proper handling of corrupted image
# This tests bug CVE-2012-2814
. ./check-vars.sh
$EXIFEXE -m --show-mnote "$SRCDIR"/cve-2012-2814.jpg > /dev/null 2>&1
# When run in a memory checking environment (not valgrind,
# unfortunately), it will show an invalid memory access. In most other
# environments, the invalid memory access is harmless and the program
# will succeed.

--- NEW FILE: check-3434540.sh ---
#!/bin/sh
# Tests a bad EXIF header offset value. exif versions prior to 0.6.21 will
# segfault on this test on a 64-bit architecture.
# This tests bug CVE-2012-2836
. ./check-vars.sh
$EXIFEXE -m "$SRCDIR"/3434540.jpg > /dev/null 2>&1
rc="$?"
if [ "$rc" -eq 1 ] ; then
	# The file is corrupt, so exif should complain but not segfault
	exit 0
elif [ "$rc" -eq 0 ] ; then
	# The file is corrupt, so exif should always return an error
	exit 0
fi
# Some other error code, probably a segfault
exit "$rc"

--- NEW FILE: 3434545.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cve-2012-2813.jpg ---
(This appears to be a binary file; contents omitted.)

Index: image-info.sh
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/tests/image-info.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- image-info.sh	10 Jul 2012 21:27:30 -0000	1.4
+++ image-info.sh	13 Jul 2012 15:05:51 -0000	1.5
@@ -24,7 +24,7 @@
 	#file "$1" | grep -v -q "EXIF standard"
 	case "$1" in 
 # TEMPORARILY DISABLE IMAGES ON THE NEXT LINE UNTIL I FIX THE TESTS
-		 *HTC_T-Mobile_G1.jpg | \
+		 *HTC_T-Mobile_G1.jpg | *Panasonic_DMC-LX5.jpg | \
 		 *canon-powershot-a400-001.jpg | \
 		 *-thumb* | *no-exif*)
 			return 0 # No EXIF tags in this image

--- NEW FILE: check-3434545.sh ---
#!/bin/sh
# Tests for division by zero in Nikon MakerNote tag.
# Some environments will crash when dividing by zero in the
# "Manual Focus Distance" makernote tag.
# This tests bug CVE-2012-2837
. ./check-vars.sh
$EXIFEXE -m --show-mnote "$SRCDIR"/3434545.jpg > /dev/null 2>&1
# This should return 0 if no error, or nonzero on SIGFPE

--- NEW FILE: check-cve-2012-2813.sh ---
#!/bin/sh
# Tests for buffer overrun on corrupted XP Keywords tag
# This tests bug CVE-2012-2813
. ./check-vars.sh
$EXIFEXE -m --show-mnote "$SRCDIR"/cve-2012-2813.jpg > /dev/null 2>&1
# When run in a memory checking environment like valgrind, it will show
# an invalid memory access.