[libreoffice/f20] Resolves: rhbz#1165444 abrt crash with NULL pView

Caolán McNamara caolanm at fedoraproject.org
Thu Nov 27 15:30:05 UTC 2014


commit 7a5aa20acb735d64d7c9e75aed52eb9efef4e51e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 27 15:29:59 2014 +0000

    Resolves: rhbz#1165444 abrt crash with NULL pView

 ...s-rhbz-1165444-abrt-crash-with-NULL-pView.patch |   32 ++++++++++++++++++++
 libreoffice.spec                                   |    4 ++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch b/0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch
new file mode 100644
index 0000000..9c51e09
--- /dev/null
+++ b/0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch
@@ -0,0 +1,32 @@
+From 755209d88073fd497b884b8de1348ec75c2df7eb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Wed, 19 Nov 2014 16:39:55 +0000
+Subject: [PATCH] Resolves: rhbz#1165444 abrt crash with NULL pView
+
+Change-Id: I37f02f16209f274cf0358defba6bfa109948990f
+---
+ sc/source/ui/view/gridwin.cxx | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
+index e8defd1..7b27f0c 100644
+--- a/sc/source/ui/view/gridwin.cxx
++++ b/sc/source/ui/view/gridwin.cxx
+@@ -5183,12 +5183,9 @@ bool ScGridWindow::GetEditUrl( const Point& rPos,
+     ScInputHandler* pInputHdl = NULL;
+     if (pViewSh)
+         pInputHdl = pViewSh->GetInputHandler();
+-
+-    if (pInputHdl && pInputHdl->IsInputMode())
+-    {
+-        EditView* pView = pInputHdl->GetTableView();
++    EditView* pView = (pInputHdl && pInputHdl->IsInputMode()) ? pInputHdl->GetTableView() : NULL;
++    if (pView)
+         return extractURLInfo(pView->GetFieldUnderMousePointer(), pName, pUrl, pTarget);
+-    }
+ 
+     //! nPosX/Y mit uebergeben?
+     SCsCOL nPosX;
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index b3634e1..07f8203 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -333,6 +333,7 @@ Patch77: 0006-fdo-83765-do-not-update-references-in-SortReorderByC.patch
 Patch78: 0007-fix-fdo-79441-again-and-keep-references-to-other-she.patch
 Patch79: 0008-fdo-86708-paint-after-Undo-of-Sort.patch
 Patch80: 0001-Resolves-fdo-84043-don-t-create-duplicate-Mirrored-X.patch
+Patch81: 0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2274,8 +2275,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-* Thu Nov 27 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.7.2-11-unbuilt
+* Thu Nov 27 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.7.2-11
 - Resolves: fdo#84043 don't create duplicate Mirrored props
+- Resolves: rhbz#1165444 abrt crash with NULL pView
 
 * Wed Nov 26 2014 Eike Rathke <erack at redhat.com> - 1:4.2.7.2-10
 - Resolves: rhbz#1167250 Crash in clipboard code


More information about the scm-commits mailing list