From 2ad608ffb6872f16f29fd88687156bf5f098ff5a Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Wed, 29 Jun 2016 01:45:40 -0500
Subject: [PATCH] Fix crash in GdkPixbuf loader (#1279152)

---
 libopenraw-bz1279152.patch | 26 ++++++++++++++++++++++++++
 libopenraw.spec            |  8 +++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 libopenraw-bz1279152.patch

diff --git a/libopenraw-bz1279152.patch b/libopenraw-bz1279152.patch
new file mode 100644
index 0000000..612e038
--- /dev/null
+++ b/libopenraw-bz1279152.patch
@@ -0,0 +1,26 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=1279152
+https://bugs.freedesktop.org/show_bug.cgi?id=93712
+https://cgit.freedesktop.org/libopenraw/commit/?id=f19e73b
+
+--- a/gnome/pixbuf-loader.c
++++ b/gnome/pixbuf-loader.c
+@@ -98,7 +98,6 @@ gdk_pixbuf__or_image_stop_load (gpointer
+ 	
+     GdkPixbuf *pixbuf = NULL;
+     ORRawFileRef raw_file = NULL;
+-    (void)error;
+ 
+     raw_file = or_rawfile_new_from_memory(context->data->data, context->data->len,
+                                           OR_DATA_TYPE_NONE);
+@@ -129,6 +128,11 @@ gdk_pixbuf__or_image_stop_load (gpointer
+                                       context->user_data);
+         }
+         result = TRUE;
++    } else {
++        g_set_error (error,
++                     GDK_PIXBUF_ERROR,
++                     GDK_PIXBUF_ERROR_FAILED,
++                     "Unable to load RAW file");
+     }
+ 
+ 
diff --git a/libopenraw.spec b/libopenraw.spec
index 1a41ee9..661e678 100644
--- a/libopenraw.spec
+++ b/libopenraw.spec
@@ -1,10 +1,12 @@
 Summary:	Decode camera RAW files
 Name:		libopenraw
 Version:	0.0.9
-Release:	17%{?dist}
+Release:	18%{?dist}
 License:	LGPLv3+
 URL:		http://libopenraw.freedesktop.org/wiki
 Source0:	http://libopenraw.freedesktop.org/download/%{name}-%{version}.tar.bz2
+# https://bugzilla.redhat.com/show_bug.cgi?id=1279152
+Patch0: 	libopenraw-bz1279152.patch
 
 BuildRequires:	libtool autoconf automake
 BuildRequires:	boost-devel
@@ -64,6 +66,7 @@ digital cameras, in GTK+ applications.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static --enable-gnome
@@ -127,6 +130,9 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
 %{_libdir}/gdk-pixbuf-2.0/*/loaders/*.so
 
 %changelog
+* Wed Jun 29 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 0.0.9-18
+- Fix crash in GdkPixbuf loader (#1279152)
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.9-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild