From: Guillaume Cottenceau Date: Fri, 31 Dec 2010 22:00:28 +0000 (+0100) Subject: fix crash on some strange data from Pentax device, thanks Harald Lenz X-Git-Url: http://git.zarb.org/?p=booh;a=commitdiff_plain;h=475d2fe64989f26603b0b4319d8b11822ee6838a fix crash on some strange data from Pentax device, thanks Harald Lenz --- diff --git a/ext/rbbooh.cc b/ext/rbbooh.cc index 86ff865..da8cc15 100644 --- a/ext/rbbooh.cc +++ b/ext/rbbooh.cc @@ -98,7 +98,7 @@ static VALUE exif_orientation(VALUE module, VALUE filename) { return Qnil; } Exiv2::ExifData::const_iterator i = exifData.findKey(Exiv2::ExifKey("Exif.Image.Orientation")); - if (i != exifData.end()) { + if (i != exifData.end() && i->count() > 0) { return INT2NUM(i->value().toLong()); } return Qnil; @@ -132,7 +132,7 @@ static VALUE exif_datetimeoriginal(VALUE module, VALUE filename) { return Qnil; } Exiv2::ExifData::const_iterator i = exifData.findKey(Exiv2::ExifKey("Exif.Photo.DateTimeOriginal")); - if (i != exifData.end()) { + if (i != exifData.end() && i->count() > 0) { return rb_str_new2(i->value().toString().c_str()); } return Qnil;