Merge lp:~jpakkane/thumbnailer/exifcrash into lp:thumbnailer

[Jussi Pakkanen]

Prevent crash if exif entry is null.

Prevent crash if exif entry is null.

[lp:~jpakkane/thumbnailer/exifcrash]

76. By Jussi Pakkanen on 2014-03-19

More dense.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:76
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-armhf-ci/29/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-trusty-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/thumbnailer-ci/41/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, fixed the crash

review: Approve

=== modified file 'src/imagescaler.cpp'
--- src/imagescaler.cpp	2014-03-05 09:29:45 +0000
+++ src/imagescaler.cpp	2014-03-19 06:57:51 +0000
@@ -62,15 +62,17 @@
     // https://bugzilla.gnome.org/show_bug.cgi?id=725582
     if(ed) {
       ExifEntry *e = exif_data_get_entry(ed, EXIF_TAG_ORIENTATION);
-      int orientation = exif_get_short(e->data, exif_data_get_byte_order(ed));
-      if(orientation == 6) {
-        rot = gdk_pixbuf_rotate_simple(src, GDK_PIXBUF_ROTATE_CLOCKWISE);
-      } else if (orientation == 8) {
-        rot = gdk_pixbuf_rotate_simple(src, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE);
-      } else if (orientation == 3) {
-        rot = gdk_pixbuf_rotate_simple(src, GDK_PIXBUF_ROTATE_UPSIDEDOWN);
-      } else {
-          // We don't do mirrored images, at least not yet.
+      if(e) {
+          int orientation = exif_get_short(e->data, exif_data_get_byte_order(ed));
+          if(orientation == 6) {
+              rot = gdk_pixbuf_rotate_simple(src, GDK_PIXBUF_ROTATE_CLOCKWISE);
+          } else if (orientation == 8) {
+              rot = gdk_pixbuf_rotate_simple(src, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE);
+          } else if (orientation == 3) {
+              rot = gdk_pixbuf_rotate_simple(src, GDK_PIXBUF_ROTATE_UPSIDEDOWN);
+          } else {
+              // We don't do mirrored images, at least not yet.
+          }
       }
     }
     if(!rot) {