[libexif-cvs] exif/exif main.c,1.24,1.25

[<lu...@us...>]

Update of /cvsroot/libexif/exif/exif
In directory usw-pr-cvs1:/tmp/cvs-serv24198/exif

Modified Files:
	main.c 
Log Message:

2002-10-22  Lutz Müller <lu...@us...>

	* exif/main.c: Print usage if no arguments are given. Save modified
	  files on --remove-ifd and --remove. Try to avoid a segfault.


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- main.c	22 Oct 2002 19:49:23 -0000	1.24
+++ main.c	22 Oct 2002 19:53:53 -0000	1.25
@@ -262,7 +262,8 @@
 
 	if (ifd_string) {
 		ifd = exif_ifd_from_string (ifd_string);
-		if ((ifd < 0) || !exif_ifd_get_name (ifd)) {
+		if ((ifd < EXIF_IFD_0) || (ifd >= EXIF_IFD_COUNT) ||
+		    !exif_ifd_get_name (ifd)) {
 			fprintf (stderr, _("Invalid IFD '%s'. Valid IFDs are "
 				"'0', '1', 'EXIF', 'GPS', and "
 				"'Interoperability'."), ifd_string);