[libreoffice] Resolves: rhbz#1165444 abrt crash with NULL pView
Caolán McNamara
caolanm at fedoraproject.org
Thu Nov 27 15:26:22 UTC 2014
commit 26feda31a0a8eb33160f0b5961a68770801f50d0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 27 15:24:36 2014 +0000
Resolves: rhbz#1165444 abrt crash with NULL pView
...s-rhbz-1165444-abrt-crash-with-NULL-pView.patch | 32 ++++++++++++++++++++
libreoffice.spec | 6 +++-
2 files changed, 37 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 26cedf0..7b9879d 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -46,7 +46,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.0
-Release: 2%{?libo_prerelease}%{?dist}
+Release: 3%{?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 Artistic and MPLv2.0 and CC0
Group: Applications/Productivity
URL: http://www.libreoffice.org/
@@ -325,6 +325,7 @@ Patch17: 0001-Resolves-fdo-37559-revert-adding-extra-dummy-polygon.patch
Patch18: 0001-Resolves-fdo-86466-Wrong-background-color-shown-in-f.patch
Patch19: 0001-Revert-Resolves-i63015-always-default-to-WinAnsiEnco.patch
Patch20: 0001-Resolves-fdo-84043-don-t-create-duplicate-Mirrored-X.patch
+Patch21: 0001-Resolves-rhbz-1165444-abrt-crash-with-NULL-pView.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@@ -2284,6 +2285,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Thu Nov 27 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.4.0.0-3.beta1
+- Resolves: rhbz#1165444 abrt crash with NULL pView
+
* Thu Nov 27 2014 Marek Kasik <mkasik at redhat.com> - 1:4.4.0.0-2.beta1
- Rebuild (poppler-0.28.1)
More information about the scm-commits
mailing list