From 475d2fe64989f26603b0b4319d8b11822ee6838a Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Fri, 31 Dec 2010 23:00:28 +0100 Subject: [PATCH] fix crash on some strange data from Pentax device, thanks Harald Lenz --- ext/rbbooh.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.21.3