Merge lp:~om26er/ubuntu/maverick/gexiv2/gexiv2-fix-636161 into lp:ubuntu/maverick/gexiv2

[Omer Akram]

backporting the fix from upstream svn

[Michael Vogt (mvo)]

Thanks for your branch and for getting this fix from upstream!

I will upload the fix now, it would be nice if you could add a TEST CASE to the bugreport.
If there is no link to a picture file available that fails I think we just need to add
a generic "test for regressions" fix and/or ask the original reporter to test.

I would also like to modify the changelog description a little bit as the bug is about
a specific format, not about a mass import (that is just where the problem manifests
itself). But I'm happy to change that myself in the changelog.

review: Approve

[Michael Vogt (mvo)]

Merged here:
https://code.launchpad.net/~ubuntu-branches/ubuntu/maverick/gexiv2/maverick-proposed

[Michael Vogt (mvo)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-23 10:18:25 +0000
+++ debian/changelog	2010-11-20 14:01:34 +0000
@@ -1,3 +1,10 @@
+gexiv2 (0.2.0-0ubuntu2.1) maverick-proposed; urgency=low
+
+  * debian/patches/do_not_crash_when_importing_images.patch:
+    - do not crash when importing large amount of images (LP: #636161)
+
+ -- Omer Akram <[e-mail]>  Sat, 20 Nov 2010 15:15:16 +0500
+
 gexiv2 (0.2.0-0ubuntu2) maverick; urgency=low
 
   * debian/libgexiv2-dev.install:

=== added directory 'debian/patches'
=== added file 'debian/patches/do_not_crash_when_importing_images.patch'
--- debian/patches/do_not_crash_when_importing_images.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/do_not_crash_when_importing_images.patch	2010-11-20 14:01:34 +0000
@@ -0,0 +1,22 @@
+diff -ruN a//gexiv2/gexiv2-metadata.cpp b//gexiv2/gexiv2-metadata.cpp
+--- a//gexiv2/gexiv2-metadata.cpp	2010-08-21 04:07:07.000000000 +0500
++++ b//gexiv2/gexiv2-metadata.cpp	2010-11-20 13:03:21.215636605 +0500
+@@ -505,6 +505,18 @@
+     
+         Exiv2::ExifKey std_key ("Exif.Image.Orientation");
+         it = exif_data.findKey (std_key);
++                
++        // TODO: This was added in response to http://trac.yorba.org/ticket/2514
++        // The user supplied a file to us with two Exif.Image.Orientation fields, one reported (the
++        // first) as zero by exiv2.  I discovered that field has a count() of zero, or is emtpy,
++        // which causes a segfault when the iterator is dereferenced.
++        //
++        // This searches for the first matching non-empty key.  A better solution would be to guard
++        // against this in all searches for all domains, but that's too much of a change for now.
++        // We'll probably need to do this for the next release.
++        while (it != exif_data.end() && it->count() == 0)
++            it++;
++        
+         if (it != exif_data.end ()) {
+             GExiv2Orientation orientation = (GExiv2Orientation) it->toLong ();
+ 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2010-11-20 14:01:34 +0000
@@ -0,0 +1,1 @@
+do_not_crash_when_importing_images.patch

=== modified file 'gexiv2/gexiv2-metadata.cpp'
--- gexiv2/gexiv2-metadata.cpp	2010-06-30 00:41:43 +0000
+++ gexiv2/gexiv2-metadata.cpp	2010-11-20 14:01:34 +0000
@@ -505,6 +505,18 @@
     
         Exiv2::ExifKey std_key ("Exif.Image.Orientation");
         it = exif_data.findKey (std_key);
+                
+        // TODO: This was added in response to http://trac.yorba.org/ticket/2514
+        // The user supplied a file to us with two Exif.Image.Orientation fields, one reported (the
+        // first) as zero by exiv2.  I discovered that field has a count() of zero, or is emtpy,
+        // which causes a segfault when the iterator is dereferenced.
+        //
+        // This searches for the first matching non-empty key.  A better solution would be to guard
+        // against this in all searches for all domains, but that's too much of a change for now.
+        // We'll probably need to do this for the next release.
+        while (it != exif_data.end() && it->count() == 0)
+            it++;
+        
         if (it != exif_data.end ()) {
             GExiv2Orientation orientation = (GExiv2Orientation) it->toLong ();