[libexif-cvs] exif/exif main.c,1.66,1.67

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

Update of /cvsroot/libexif/exif/exif
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4567/exif

Modified Files:
	main.c 
Log Message:
EXIF_LOG_CODE_NO_MEMORY is always a fatal error


Index: main.c
===================================================================
RCS file: /cvsroot/libexif/exif/exif/main.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -d -r1.66 -r1.67
--- main.c	19 Nov 2008 08:44:47 -0000	1.66
+++ main.c	9 Dec 2008 20:17:39 -0000	1.67
@@ -122,6 +122,7 @@ log_func (ExifLog *log, ExifLogCode code
 		/* We ignore corrupted data event in some cases */
 		if (log_arg->ignore_corrupted)
 			return;
+		/* Fall through to EXIF_LOG_CODE_NO_MEMORY */
 	case EXIF_LOG_CODE_NO_MEMORY:
 		put_colorstring (stderr, COL_RED COL_BOLD COL_UNDERLINE);
 		fprintf (stderr, exif_log_code_get_title (code));
@@ -133,7 +134,17 @@ log_func (ExifLog *log, ExifLogCode code
 		vfprintf (stderr, format, args);
 		put_colorstring (stderr, COL_NORMAL);
 		fprintf (stderr, "\n");
-		if (!log_arg->debug)
+
+		/*
+		 * EXIF_LOG_CODE_NO_MEMORY is always a fatal error, so exit. 
+		 * EXIF_LOG_CODE_CORRUPT_DATA is only fatal if debug mode
+		 * is off.
+		 *
+		 * Exiting the program due to a log message is really a bad
+		 * idea to begin with. This should be removed once the libexif
+		 * API is fixed to properly return error codes everywhere.
+		 */
+		if ((code == EXIF_LOG_CODE_NO_MEMORY) || !log_arg->debug)
 			exit (1);
 		break;
 	default: