blob: 34a8a569562adedf22553c663721a6e0bac9a6ee (
plain) (
tree)
|
|
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);
|