From a7f3def03d61496a3272804de5a868458636b693 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Oct 14 2019 19:03:26 +0000
Subject: tdf#124729 check error status before continuing


---

diff --git a/0001-Related-tdf-124729-check-error-status-before-continu.patch b/0001-Related-tdf-124729-check-error-status-before-continu.patch
new file mode 100644
index 0000000..30370fe
--- /dev/null
+++ b/0001-Related-tdf-124729-check-error-status-before-continu.patch
@@ -0,0 +1,38 @@
+From 46368abd5ca52498e1b6843e9748672ec39b79f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Sun, 13 Oct 2019 20:48:14 +0100
+Subject: [PATCH] Related: tdf#124729 check error status before continuing
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Ic39e569121b2646995b8dec50c3941db65fdd500
+Reviewed-on: https://gerrit.libreoffice.org/80745
+Tested-by: Jenkins
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+Tested-by: Caolán McNamara <caolanm@redhat.com>
+---
+ vcl/unx/gtk3/gtk3gtkinst.cxx | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
+index 9831762f4a43..15f01258d0ed 100644
+--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
++++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
+@@ -1063,7 +1063,12 @@ private:
+ 
+         GdkWindow *pWindow = gtk_widget_get_window(pParent);
+         m_pContext = gdk_window_create_gl_context(pWindow, nullptr);
+-        gdk_gl_context_realize(m_pContext, nullptr);
++        if (!m_pContext)
++            return false;
++
++        if (!gdk_gl_context_realize(m_pContext, nullptr))
++            return false;
++
+         gdk_gl_context_make_current(m_pContext);
+         glGenFramebuffersEXT(1, &m_nFrameBuffer);
+         glGenRenderbuffersEXT(1, &m_nRenderBuffer);
+-- 
+2.21.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 23ef598..560f073 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -62,7 +62,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.3
-Release:        5%{?libo_prerelease}%{?dist}
+Release:        6%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/
 
@@ -281,6 +281,7 @@ Patch12: 0003-keep-name-percent-encoded.patch
 Patch13: 0001-construct-final-url-from-parsed-output.patch
 Patch14: 0002-Improve-check.patch
 Patch15: 0001-Properly-obtain-location.patch
+Patch16: 0001-Related-tdf-124729-check-error-status-before-continu.patch
 
 %if 0%{?rhel}
 # not upstreamed
@@ -2315,6 +2316,9 @@ done
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Mon Oct 14 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.1.6.3-6
+- tdf#124729 check error status before continuing
+
 * Fri Sep 27 2019 Caolán McNamara <caolanm@redhat.com> - 1:6.1.6.3-5
 - CVE-2019-9853