rpms/openoffice.org/F-13 workspace.cmcfixes64.patch, NONE, 1.1 openoffice.org.spec, 1.2187, 1.2188

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3775

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.cmcfixes64.patch 
Log Message:
protect against broken samba servers

workspace.cmcfixes64.patch:
 vtablefactory.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE workspace.cmcfixes64.patch ---
diff -r 28ba3ecf6c22 -r db44de918518 bridges/source/cpp_uno/shared/vtablefactory.cxx
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx	Mon Oct 12 09:26:03 2009 +0000
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx	Mon Oct 12 13:29:25 2009 +0000
@@ -272,7 +272,7 @@
         char *tmpfname = new char[aTmpName.getLength()+1];
         strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
         if ((block.fd = mkstemp(tmpfname)) == -1)
-          perror("creation of executable memory area failed");
+            perror("creation of executable memory area failed");
         if (block.fd == -1)
         {
             delete[] tmpfname;
@@ -280,7 +280,13 @@
         }
         unlink(tmpfname);
         delete[] tmpfname;
-        ftruncate(block.fd, block.size);
+        if (ftruncate(block.fd, block.size) == -1)
+        {
+            perror("truncation of executable memory area failed");
+            close(block.fd);
+            block.fd = -1;
+            break;
+        }
         block.start = mmap(NULL, block.size, PROT_READ | PROT_WRITE, MAP_SHARED, block.fd, 0);
         if (block.start== MAP_FAILED) {
             block.start = 0;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/openoffice.org.spec,v
retrieving revision 1.2187
retrieving revision 1.2188
diff -u -p -r1.2187 -r1.2188
--- openoffice.org.spec	27 May 2010 19:49:01 -0000	1.2187
+++ openoffice.org.spec	28 May 2010 07:45:58 -0000	1.2188
@@ -150,6 +150,7 @@ Patch79: workspace.vcl111.patch
 Patch80: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
 Patch81: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
 Patch82: openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch
+Patch83: workspace.cmcfixes64.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1730,6 +1731,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch80 -p0 -b .ooo111699.svx.nullfield.patch
 %patch81 -p0 -b .ooo111758.sd.xerror.patch
 %patch82 -p0 -b .ooo111886.sw.layout.workaround.patch
+%patch83 -p1 -b .workspace.cmcfixes64.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4215,8 +4217,9 @@ fi
 %endif
 
 %changelog
-* Thu May 27 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.24.UNRELEASED
+* Fri May 28 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.24.UNRELEASED
 - Resolves: rhbz#596807 openoffice.org-3.2.0.ooo111886.sw.layout.workaround.patch
+- protect against broken samba servers
 
 * Fri May 21 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.23
 - Resolves: rhbz#594035 openoffice.org-3.3.0.ooo111758.sd.xerror.patch