summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Briesenick <sbriesen@gentoo.org>2006-08-18 23:18:00 +0000
committerStefan Briesenick <sbriesen@gentoo.org>2006-08-18 23:18:00 +0000
commit222ef48a945c17f60e868b2050280f1cd6eb732a (patch)
tree5d3c79811dac4c7f9542cc634af36e775fc380db /media-gfx/exiv2/files
parentStable on ia64. (diff)
downloadhistorical-222ef48a945c17f60e868b2050280f1cd6eb732a.tar.gz
historical-222ef48a945c17f60e868b2050280f1cd6eb732a.tar.bz2
historical-222ef48a945c17f60e868b2050280f1cd6eb732a.zip
adding patch for crash in jpgimage.cpp, solving bug #144347.
Package-Manager: portage-2.1.1_pre5-r2
Diffstat (limited to 'media-gfx/exiv2/files')
-rw-r--r--media-gfx/exiv2/files/digest-exiv2-0.10-r13
-rw-r--r--media-gfx/exiv2/files/exiv2-0.10-jpgimage.diff14
2 files changed, 17 insertions, 0 deletions
diff --git a/media-gfx/exiv2/files/digest-exiv2-0.10-r1 b/media-gfx/exiv2/files/digest-exiv2-0.10-r1
new file mode 100644
index 000000000000..14accf6b31e8
--- /dev/null
+++ b/media-gfx/exiv2/files/digest-exiv2-0.10-r1
@@ -0,0 +1,3 @@
+MD5 5af2256fb9895d9331684e8c1865b956 exiv2-0.10.tar.gz 2053756
+RMD160 a236db525e592783ad56e975cd45002a0e7b15ba exiv2-0.10.tar.gz 2053756
+SHA256 0f42a455f89e18e371d114efa8da63c05c183c676e3ea3956fafc9c5ffcac077 exiv2-0.10.tar.gz 2053756
diff --git a/media-gfx/exiv2/files/exiv2-0.10-jpgimage.diff b/media-gfx/exiv2/files/exiv2-0.10-jpgimage.diff
new file mode 100644
index 000000000000..d70541015196
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.10-jpgimage.diff
@@ -0,0 +1,14 @@
+--- src/jpgimage.cpp.orig 2006-06-02 17:29:31.000000000 +0200
++++ src/jpgimage.cpp 2006-08-19 00:59:00.000000000 +0200
+@@ -314,8 +314,9 @@
+ // Find actual Iptc data within the APP13 segment
+ if (!Photoshop::locateIptcIrb(psData.pData_, psData.size_,
+ &record, &sizeHdr, &sizeIptc)) {
+- assert(sizeIptc);
+- if (iptcData_.load(record + sizeHdr, sizeIptc)) throw Error(36, "IPTC");
++ if (sizeIptc) {
++ if (iptcData_.load(record + sizeHdr, sizeIptc)) throw Error(36, "IPTC");
++ }
+ }
+ --search;
+ }