wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update NSPR to NSPR_4_10_7_BETA3 to fix bug 1034415 and bug 979278

Browse Source
This commit is contained in:
Ehsan Akhgari 2014-07-07 11:13:29 -04:00
parent 48bcaef770
commit 7e69de339a
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nsprpub/TAG-INFO
View File

@ -1 +1 @@
NSPR_4_10_7_BETA2
NSPR_4_10_7_BETA3

1
nsprpub/config/prdepend.h
View File

@ -10,4 +10,3 @@
*/
#error "Do not include this header file."

2
nsprpub/configure vendored
View File

@ -7099,8 +7099,6 @@ tools are selected during the Xcode/Developer Tools installation." "$LINENO" 5
# Use temp file for windres (bug 213281)
RCFLAGS='-O coff --use-temp-file'
else
CC=cl
CXX=cl
LD=link
AR='lib -NOLOGO -OUT:"$@"'
AR_FLAGS=

2
nsprpub/configure.in
View File

@ -1915,8 +1915,6 @@ tools are selected during the Xcode/Developer Tools installation.])
# Use temp file for windres (bug 213281)
RCFLAGS='-O coff --use-temp-file'
else
CC=cl
CXX=cl
LD=link
AR='lib -NOLOGO -OUT:"$@"'
AR_FLAGS=

16
nsprpub/pr/src/threads/prtpd.c
View File

@ -130,8 +130,9 @@ PR_IMPLEMENT(PRStatus) PR_NewThreadPrivateIndex(
** destructor function and a non-NULL per-thread-private data value,
** the destructor function is invoked.
**
** This can return PR_FAILURE if index is invalid (ie., beyond the current
** high water mark) or memory is insufficient to allocate an exanded vector.
** This can return PR_FAILURE if index is invalid (ie., beyond the limit
** on the TPD slots) or memory is insufficient to allocate an expanded
** vector.
*/
PR_IMPLEMENT(PRStatus) PR_SetThreadPrivate(PRUintn index, void *priv)
@ -139,11 +140,10 @@ PR_IMPLEMENT(PRStatus) PR_SetThreadPrivate(PRUintn index, void *priv)
PRThread *self = PR_GetCurrentThread();
/*
** The index being set might not have a sufficient vector in this
** thread. But if the index has been allocated, it's okay to go
** ahead and extend this one now.
** To improve performance, we don't check if the index has been
** allocated.
*/
if ((index >= _PR_TPD_LIMIT) || (index >= _pr_tpd_highwater))
if (index >= _PR_TPD_LIMIT)
{
PR_SetError(PR_TPD_RANGE_ERROR, 0);
return PR_FAILURE;
@ -152,6 +152,10 @@ PR_IMPLEMENT(PRStatus) PR_SetThreadPrivate(PRUintn index, void *priv)
PR_ASSERT(((NULL == self->privateData) && (0 == self->tpdLength))
|| ((NULL != self->privateData) && (0 != self->tpdLength)));
/*
** If this thread does not have a sufficient vector for the index
** being set, go ahead and extend this vector now.
*/
if ((NULL == self->privateData) || (self->tpdLength <= index))
{
void *extension = PR_CALLOC(_pr_tpd_length * sizeof(void*));