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

Bug 935568, update Mozilla to NSPR 4.10.2 RTM, r=wtc/me

Browse Source
This commit is contained in:
Kai Engert 2013-11-09 11:18:00 +01:00
parent 2df2812ddd
commit 8d1d356bcf
5 changed files with 13 additions and 8 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_2_BETA1
NSPR_4_10_2_RTM

1
nsprpub/config/prdepend.h
View File

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

12
nsprpub/lib/ds/plarena.c
View File

@ -153,7 +153,7 @@ PR_IMPLEMENT(void *) PL_ArenaAllocate(PLArenaPool *pool, PRUint32 nb)
{
a = pool->current;
do {
if ( a->avail +nb <= a->limit ) {
if ( nb <= a->limit - a->avail ) {
pool->current = a;
rp = (char *)a->avail;
a->avail += nb;
@ -171,7 +171,7 @@ PR_IMPLEMENT(void *) PL_ArenaAllocate(PLArenaPool *pool, PRUint32 nb)
return(0);
for ( a = arena_freelist, p = NULL; a != NULL ; p = a, a = a->next ) {
if ( a->base +nb <= a->limit ) {
if ( nb <= a->limit - a->base ) {
if ( p == NULL )
arena_freelist = a->next;
else
@ -196,8 +196,12 @@ PR_IMPLEMENT(void *) PL_ArenaAllocate(PLArenaPool *pool, PRUint32 nb)
/* attempt to allocate from the heap */
{
PRUint32 sz = PR_MAX(pool->arenasize, nb);
sz += sizeof *a + pool->mask; /* header and alignment slop */
a = (PLArena*)PR_MALLOC(sz);
if (PR_UINT32_MAX - sz < sizeof *a + pool->mask) {
a = NULL;
} else {
sz += sizeof *a + pool->mask; /* header and alignment slop */
a = (PLArena*)PR_MALLOC(sz);
}
if ( NULL != a ) {
a->limit = (PRUword)a + sz;
a->base = a->avail = (PRUword)PL_ARENA_ALIGN(pool, a + 1);

4
nsprpub/pr/include/prinit.h
View File

@ -31,11 +31,11 @@ PR_BEGIN_EXTERN_C
** The format of the version string is
** "<major version>.<minor version>[.<patch level>] [<Beta>]"
*/
#define PR_VERSION "4.10.2 Beta"
#define PR_VERSION "4.10.2"
#define PR_VMAJOR 4
#define PR_VMINOR 10
#define PR_VPATCH 2
#define PR_BETA PR_TRUE
#define PR_BETA PR_FALSE
/*
** PRVersionCheck

2
nsprpub/pr/src/pthreads/ptio.c
View File

@ -4586,7 +4586,7 @@ PR_IMPLEMENT(PRFileDesc*) PR_ImportUDPSocket(PRInt32 osfd)
if (!_pr_initialized) _PR_ImplicitInitialization();
fd = pt_SetMethods(osfd, PR_DESC_SOCKET_UDP, PR_FALSE, PR_TRUE);
if (NULL != fd) close(osfd);
if (NULL == fd) close(osfd);
return fd;
} /* PR_ImportUDPSocket */