rpms/openoffice.org/devel openoffice.org-3.0.0.ooo94659.sal.magazine.patch, NONE, 1.1 openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch, NONE, 1.1 openoffice.org.spec, 1.1673, 1.1674

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv965

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo94659.sal.magazine.patch 
	openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch 
Log Message:
add safety patches

openoffice.org-3.0.0.ooo94659.sal.magazine.patch:

--- NEW FILE openoffice.org-3.0.0.ooo94659.sal.magazine.patch ---
Index: alloc_cache.h
===================================================================
RCS file: /cvs/porting/sal/rtl/source/alloc_cache.h,v
retrieving revision 1.3
retrieving revision 1.3.50.1
diff -u -r1.3 -r1.3.50.1
--- openoffice.org.orig/sal/rtl/source/alloc_cache.h	10 Apr 2008 12:01:34 -0000	1.3
+++ openoffice.org/sal/rtl/source/alloc_cache.h	6 Oct 2008 10:43:46 -0000	1.3.50.1
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: alloc_cache.h,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.50.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -86,7 +86,7 @@
 /** rtl_cache_magazine_type
  *  @internal
  */
-#define RTL_CACHE_MAGAZINE_SIZE 64
+#define RTL_CACHE_MAGAZINE_SIZE 61
 
 typedef struct rtl_cache_magazine_st rtl_cache_magazine_type;
 struct rtl_cache_magazine_st

openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch:

--- NEW FILE openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch ---
Index: osl/unx/process.c
===================================================================
RCS file: /cvs/porting/sal/osl/unx/process.c,v
retrieving revision 1.44
diff -u -r1.44 process.c
--- openoffice.org.orig/sal/osl/unx/process.c	10 Apr 2008 11:10:31 -0000	1.44
+++ openoffice.org/sal/osl/unx/process.c	16 Oct 2008 12:51:26 -0000
@@ -466,7 +466,7 @@
     if ((pid = fork()) == 0)
     {
 		/* Child */
-	    close(channel[0]);
+	    if (channel[0] != -1) close(channel[0]);
 
 		if ((data.m_uid != (uid_t)-1) && ((data.m_uid != getuid()) || (data.m_gid != getgid())))
 		{
@@ -500,32 +500,32 @@
 			/* Connect std IO to pipe ends */
 
 			/* Write end of stdInput not used in child process */
-			close( stdInput[1] );
+			if (stdInput[1] != -1) close( stdInput[1] );
 
 			/* Read end of stdOutput not used in child process */
-			close( stdOutput[0] );
+			if (stdOutput[0] != -1) close( stdOutput[0] );
 
 			/* Read end of stdError not used in child process */
-			close( stdError[0] );
+			if (stdError[0] != -1) close( stdError[0] );
 
 			/* Redirect pipe ends to std IO */
 
 			if ( stdInput[0] != STDIN_FILENO )
 			{
 				dup2( stdInput[0], STDIN_FILENO );
-				close( stdInput[0] );
+				if (stdInput[0] != -1) close( stdInput[0] );
 			}
 
 			if ( stdOutput[1] != STDOUT_FILENO )
 			{
 				dup2( stdOutput[1], STDOUT_FILENO );
-				close( stdOutput[1] );
+				if (stdOutput[1] != -1) close( stdOutput[1] );
 			}
 
 			if ( stdError[1] != STDERR_FILENO )
 			{
 				dup2( stdError[1], STDERR_FILENO );
-				close( stdError[1] );
+				if (stdError[1] != -1) close( stdError[1] );
 			}
 
 	    	pid=execv(data.m_pszArgs[0], (sal_Char **)data.m_pszArgs);
@@ -539,7 +539,7 @@
 		/* if we reach here, something went wrong */
 		write(channel[1], &errno, sizeof(errno));
 
-	    close(channel[1]);
+	    if (channel[1] != -1) close(channel[1]);
 
 		_exit(255);
     }
@@ -547,12 +547,12 @@
     {   /* Parent  */
 		int   status;
 
-		close(channel[1]);
+		if (channel[1] != -1) close(channel[1]);
 
 		/* Close unused pipe ends */
-		close( stdInput[0] );
-		close( stdOutput[1] );
-		close( stdError[1] );
+		if (stdInput[0] != -1) close( stdInput[0] );
+		if (stdOutput[1] != -1) close( stdOutput[1] );
+		if (stdError[1] != -1) close( stdError[1] );
 
 		while (((i = read(channel[0], &status, sizeof(status))) < 0))
 		{
@@ -560,7 +560,7 @@
 				break;
 		}
 
-		close(channel[0]);
+		if (channel[0] != -1) close(channel[0]);
 
 
 		if ((pid > 0) && (i == 0))
@@ -646,9 +646,9 @@
 			if ( pdata->m_pErrorRead )
 				*pdata->m_pErrorRead = NULL;
 
-			close( stdInput[1] );
-			close( stdOutput[0] );
-			close( stdError[0] );
+			if (stdInput[1] != -1) close( stdInput[1] );
+			if (stdOutput[0] != -1) close( stdOutput[0] );
+			if (stdError[0] != -1) close( stdError[0] );
 
 			/* notify (and unblock) parent thread */
 			osl_setCondition(pdata->m_started);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1673
retrieving revision 1.1674
diff -u -r1.1673 -r1.1674
--- openoffice.org.spec	16 Oct 2008 12:42:21 -0000	1.1673
+++ openoffice.org.spec	16 Oct 2008 14:15:21 -0000	1.1674
@@ -119,6 +119,8 @@
 Patch46: workspace.vcl94.patch
 Patch47: workspace.vcl95.patch
 Patch48: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
+Patch49: openoffice.org-3.0.0.ooo94659.sal.magazine.patch
+Patch50: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1321,6 +1323,8 @@
 %patch46 -p1 -b .workspace.vcl94.patch
 %patch47 -p1 -b .workspace.vcl95.patch
 %patch48 -p1 -b .ooo94938.unopkg.handleexception.patch
+%patch49 -p1 -b .ooo94659.sal.magazine.patch
+%patch50 -p1 -b .ooo95018.sal.fdwarnings.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3686,6 +3690,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Oct 16 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.5
+- add openoffice.org-3.0.0.ooo94659.sal.magazine.patch
+- add openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+
 * Thu Oct 16 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.4
 - Resolves: rhbz#465664 brp-java-repack-jars breaks some of our jars
 - Resolves: rhbz#466605 openoffice.org-3.0.0.ooo94936.vcl.nogtkspinwarn.patch