From 6b6470b47791f17c56c176a1563b7aa433e3726f Mon Sep 17 00:00:00 2001
From: Elad Alfassa <elad@fedoraproject.org>
Date: Fri, 20 Jun 2014 21:13:20 +0300
Subject: [PATCH] Fix rhbz #1105890

---
 firefox-crash-fix.patch | 36 ++++++++++++++++++++++++++++++++++++
 libva.spec              |  7 ++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 firefox-crash-fix.patch

diff --git a/firefox-crash-fix.patch b/firefox-crash-fix.patch
new file mode 100644
index 0000000..5ba5e44
--- /dev/null
+++ b/firefox-crash-fix.patch
@@ -0,0 +1,36 @@
+From d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9 Mon Sep 17 00:00:00 2001
+From: Xiang, Haihao <haihao.xiang@intel.com>
+Date: Thu, 18 Jul 2013 05:13:31 +0000
+Subject: va: release VADisplayContext at the end of vaTerminate()
+
+Otherwise it will result in invalid reading in va_TraceEnd()
+
+Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+---
+(limited to 'va/va.c')
+
+diff --git a/va/va.c b/va/va.c
+index 6cb17ef..0ba595b 100644
+--- a/va/va.c
++++ b/va/va.c
+@@ -515,15 +515,15 @@ VAStatus vaTerminate (
+   free(old_ctx->vtable_vpp);
+   old_ctx->vtable_vpp = NULL;
+ 
+-  if (VA_STATUS_SUCCESS == vaStatus)
+-      pDisplayContext->vaDestroy(pDisplayContext);
+-
+   VA_TRACE_LOG(va_TraceTerminate, dpy);
+ 
+   va_TraceEnd(dpy);
+ 
+   va_FoolEnd(dpy);
+ 
++  if (VA_STATUS_SUCCESS == vaStatus)
++      pDisplayContext->vaDestroy(pDisplayContext);
++
+   return vaStatus;
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/libva.spec b/libva.spec
index d9b7ac9..470717a 100644
--- a/libva.spec
+++ b/libva.spec
@@ -1,11 +1,12 @@
 Name:		libva
 Version:	1.3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Video Acceleration (VA) API for Linux
 Group:		System Environment/Libraries
 License:	MIT
 URL:		http://freedesktop.org/wiki/Software/vaapi
 Source0:	http://www.freedesktop.org/software/vaapi/releases/libva/libva-%{version}.tar.bz2
+Patch0:	firefox-crash-fix.patch
 
 BuildRequires:	libudev-devel
 BuildRequires:	libXext-devel
@@ -50,6 +51,7 @@ of %{name}, including the vainfo tool for determining what (if any)
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static \
@@ -93,6 +95,9 @@ find %{buildroot} -regex ".*\.la$" | xargs rm -f --
 %{!?_without_wayland:%{_bindir}/putsurface_wayland}
 
 %changelog
+* Fri Jun 20 2014 Elad Alfassa <elad@fedoraproject.org> - 1.3.1-3
+- Apply upstream patch to fix a firefox crash (rhbz #1105890)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild