rpms/openoffice.org/devel openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch, NONE, 1.1 openoffice.org.spec, 1.2229, 1.2230

[David Tardon]

Author: dtardon

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv16437

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch 
Log Message:
Resolves: rhbz#599287 openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch

openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch:
 ww8graf.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch ---
# HG changeset patch
# Parent 25cb853961c8c5bcbe8833e2cd2323707a3d204b
#i112059# avoid possible null pointer dereference

diff -r 25cb853961c8 sw/source/filter/ww8/ww8graf.cxx
--- a/sw/source/filter/ww8/ww8graf.cxx	Tue Jun 01 06:52:22 2010 +0200
+++ b/sw/source/filter/ww8/ww8graf.cxx	Thu Jun 03 08:30:49 2010 +0200
@@ -2833,7 +2833,7 @@
         MapWrapIntoFlyFmt(pRecord, pRetFrmFmt);
 
     // Set frame name with object name
-    if( aObjName.Len() )
+    if( pRetFrmFmt /*#i52825# */ && aObjName.Len() )
         pRetFrmFmt->SetName( aObjName );
     return AddAutoAnchor(pRetFrmFmt);
 }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2229
retrieving revision 1.2230
diff -u -p -r1.2229 -r1.2230
--- openoffice.org.spec	2 Jun 2010 10:03:50 -0000	1.2229
+++ openoffice.org.spec	3 Jun 2010 06:41:28 -0000	1.2230
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 19
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -143,6 +143,7 @@ Patch72: openoffice.org-3.2.0.ooo111886.
 Patch73: workspace.cmcfixes64.patch
 Patch74: workspace.cmcfixes75.patch
 Patch75: openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch
+Patch76: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1699,6 +1700,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch73 -p1 -b .workspace.cmcfixes64.patch
 %patch74 -p1 -b .workspace.cmcfixes75.patch
 %patch75 -p0 -b .ooo112027.writerfilter.avoid.recursetodeath.patch
+%patch76 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4189,6 +4191,9 @@ fi
 %endif
 
 %changelog
+* Thu Jun 03 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.6
+- Resolves: rhbz#599287 openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch (dtardon)
+
 * Wed Jun 02 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.5
 - Resolves: rhbz#598582 openoffice.org-3.2.1.ooo112027.writerfilter.avoid.recursetodeath.patch