Fix lossless rotation if jpegexiforient is unavailable (closes #100)2.6.3

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b05d7c3..6cfe1aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu, 27 Sep 2012 16:48:48 +0200  Daniel Friesel <derf+feh@finalrewind.org>
+
+    * Fix segfault when doing lossless mirror/rotate and jpegexiforient is
+      not present <https://github.com/derf/feh/issues/100>
+
 Wed, 26 Sep 2012 17:06:50 +0200  Daniel Friesel <derf+feh@finalrewind.org>
 
     * Set EXIF orientation tag to 1 ("0,0 is top left" aka normal) after
diff --git a/src/imlib.c b/src/imlib.c
index a2bd4ac..e9f92ad 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -1198,10 +1198,9 @@ void feh_edit_inplace_lossless(winwidget w, int op)
 
 		if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
 			im_weprintf(w,
-					"lossless %s: Got exitcode %d from jpegexiforient",
-					status >> 8);
-			free(file_str);
-			return;
+					"lossless %s: Failed to update EXIF orientation tag:"
+					" jpegexiforient returned %d",
+					op_name, status >> 8);
 		}
 	}
 	free(file_str);