From 54b8a72bde001dfcd25105c492f4a243ebf25016 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 9 Apr 2007 16:29:52 +0000
Subject: [PATCH] Re-add OOo issue 64906 workaround for FreeBSD.  The root
 cause of the crash is i65462 but it was dormant until i65004 was closed.

Approved by:	maho
---
 editors/openoffice-3-devel/files/patch-i65462 | 24 +++++++++++++++++++
 .../openoffice.org-2-devel/files/patch-i65462 | 24 +++++++++++++++++++
 .../openoffice.org-3-devel/files/patch-i65462 | 24 +++++++++++++++++++
 .../files/patch-i65462                        | 24 +++++++++++++++++++
 4 files changed, 96 insertions(+)
 create mode 100644 editors/openoffice-3-devel/files/patch-i65462
 create mode 100644 editors/openoffice.org-2-devel/files/patch-i65462
 create mode 100644 editors/openoffice.org-3-devel/files/patch-i65462
 create mode 100644 editors/openoffice.org-vcltesttool/files/patch-i65462

diff --git a/editors/openoffice-3-devel/files/patch-i65462 b/editors/openoffice-3-devel/files/patch-i65462
new file mode 100644
index 000000000000..34a8a569562a
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i65462
@@ -0,0 +1,24 @@
+Re-add #i64906# workaround.  The root cause of the crash is #i65462#.
+Also see #i65004# for more information.
+
+--- sal/osl/unx/security.c	14 Mar 2007 08:28:11 -0000	1.24
++++ sal/osl/unx/security.c	6 Apr 2007 05:59:15 -0000
+@@ -76,6 +76,10 @@
+ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+ 
+ static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
++#if defined (MACOSX) || defined (FREEBSD)
++    /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */
++    size_t n = 1024;
++#else
+     long m;
+     size_t n;
+     errno = 0;
+@@ -95,6 +99,7 @@
+         OSL_ASSERT(m >= 0 && (unsigned long) m < SIZE_MAX);
+         n = (size_t) m;
+     }
++#endif
+     if (n <= SIZE_MAX - offsetof(oslSecurityImpl, m_buffer)) {
+         *bufSize = n;
+         n += offsetof(oslSecurityImpl, m_buffer);
diff --git a/editors/openoffice.org-2-devel/files/patch-i65462 b/editors/openoffice.org-2-devel/files/patch-i65462
new file mode 100644
index 000000000000..34a8a569562a
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i65462
@@ -0,0 +1,24 @@
+Re-add #i64906# workaround.  The root cause of the crash is #i65462#.
+Also see #i65004# for more information.
+
+--- sal/osl/unx/security.c	14 Mar 2007 08:28:11 -0000	1.24
++++ sal/osl/unx/security.c	6 Apr 2007 05:59:15 -0000
+@@ -76,6 +76,10 @@
+ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+ 
+ static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
++#if defined (MACOSX) || defined (FREEBSD)
++    /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */
++    size_t n = 1024;
++#else
+     long m;
+     size_t n;
+     errno = 0;
+@@ -95,6 +99,7 @@
+         OSL_ASSERT(m >= 0 && (unsigned long) m < SIZE_MAX);
+         n = (size_t) m;
+     }
++#endif
+     if (n <= SIZE_MAX - offsetof(oslSecurityImpl, m_buffer)) {
+         *bufSize = n;
+         n += offsetof(oslSecurityImpl, m_buffer);
diff --git a/editors/openoffice.org-3-devel/files/patch-i65462 b/editors/openoffice.org-3-devel/files/patch-i65462
new file mode 100644
index 000000000000..34a8a569562a
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i65462
@@ -0,0 +1,24 @@
+Re-add #i64906# workaround.  The root cause of the crash is #i65462#.
+Also see #i65004# for more information.
+
+--- sal/osl/unx/security.c	14 Mar 2007 08:28:11 -0000	1.24
++++ sal/osl/unx/security.c	6 Apr 2007 05:59:15 -0000
+@@ -76,6 +76,10 @@
+ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+ 
+ static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
++#if defined (MACOSX) || defined (FREEBSD)
++    /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */
++    size_t n = 1024;
++#else
+     long m;
+     size_t n;
+     errno = 0;
+@@ -95,6 +99,7 @@
+         OSL_ASSERT(m >= 0 && (unsigned long) m < SIZE_MAX);
+         n = (size_t) m;
+     }
++#endif
+     if (n <= SIZE_MAX - offsetof(oslSecurityImpl, m_buffer)) {
+         *bufSize = n;
+         n += offsetof(oslSecurityImpl, m_buffer);
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65462 b/editors/openoffice.org-vcltesttool/files/patch-i65462
new file mode 100644
index 000000000000..34a8a569562a
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i65462
@@ -0,0 +1,24 @@
+Re-add #i64906# workaround.  The root cause of the crash is #i65462#.
+Also see #i65004# for more information.
+
+--- sal/osl/unx/security.c	14 Mar 2007 08:28:11 -0000	1.24
++++ sal/osl/unx/security.c	6 Apr 2007 05:59:15 -0000
+@@ -76,6 +76,10 @@
+ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+ 
+ static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
++#if defined (MACOSX) || defined (FREEBSD)
++    /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */
++    size_t n = 1024;
++#else
+     long m;
+     size_t n;
+     errno = 0;
+@@ -95,6 +99,7 @@
+         OSL_ASSERT(m >= 0 && (unsigned long) m < SIZE_MAX);
+         n = (size_t) m;
+     }
++#endif
+     if (n <= SIZE_MAX - offsetof(oslSecurityImpl, m_buffer)) {
+         *bufSize = n;
+         n += offsetof(oslSecurityImpl, m_buffer);