Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/util/secport.c

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 23 matching lines @@
  *
  * ***** END LICENSE BLOCK ***** */
 
 /*
  * secport.c - portability interfaces for security libraries
  *
  * This file abstracts out libc functionality that libsec depends on
  * 
  * NOTE - These are not public interfaces
  *
- * $Id: secport.c,v 1.28 2010/01/22 02:34:30 wtc%google.com Exp $
+ * $Id: secport.c,v 1.29 2010/03/28 20:46:37 nelson%bolyard.com Exp $
  */
 
 #include "seccomon.h"
 #include "prmem.h"
 #include "prerror.h"
 #include "plarena.h"
 #include "secerr.h"
 #include "prmon.h"
 #include "nssilock.h"
 #include "secport.h"
@@ skipping 282 matching lines @@
         len  = sizeof *pool;
         lock = pool->lock;
         PZ_Lock(lock);
     }
     if (!checkedEnv) {
         /* no need for thread protection here */
         doFreeArenaPool = (PR_GetEnv("NSS_DISABLE_ARENA_FREE_LIST") == NULL);
         checkedEnv = PR_TRUE;
     }
     if (zero) {
-        PLArena *a;
-        for (a = arena->first.next; a; a = a->next) {
-            PR_ASSERT(a->base <= a->avail && a->avail <= a->limit);
-            memset((void *)a->base, 0, a->avail - a->base);
-        }
+        PL_ClearArenaPool(arena, 0);
     }
     if (doFreeArenaPool) {
         PL_FreeArenaPool(arena);
     } else {
         PL_FinishArenaPool(arena);
     }
     PORT_ZFree(arena, len);
     if (lock) {
         PZ_Unlock(lock);
         PZ_DestroyLock(lock);
@@ skipping 349 matching lines @@
     const unsigned char *b = (const unsigned char*) ib;
     size_t i;
     unsigned char r = 0;
 
     for (i = 0; i < n; ++i) {
         r |= *a++ ^ *b++;
     }
 
     return r;
 }