Closed Bug 580137 Opened 11 years ago Closed 11 years ago

Merge SOFTOKEN_3_13_BRANCH onto the NSS trunk

Categories

(NSS :: Libraries, defect, P1)

defect

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: wtc, Assigned: wtc)

Details

Attachments

(3 files)

Now that we have created the NSS_3_12_BRANCH, we need to merge the
SOFTOKEN_3_13_BRANCH onto the NSS trunk, and stop using the
SOFTOKEN_3_13_BRANCH.

The attached patch was generated by
cvs -q update -kk -j SOFTOKEN_3_13_BRANCH mozilla/security/nss/lib/freebl
cvs -q update -kk -j SOFTOKEN_3_13_BRANCH mozilla/security/nss/lib/softoken

There have been no changes to mozilla/dbm and mozilla/security/dbm on the
SOFTOKEN_3_13_BRANCH.
Attached patch PatchSplinter Review
I checked in the patch on the NSS trunk (NSS 3.13).
One regression from the merge: new memory leaks on the NSS tinderbox
named "trunk memleak aquash SunOS/i386 32bit", in both DBG and OPT
builds.

In OPT builds, the new memory leak stacks all end in
NSC_GetAttributeValue/sftkdb_GetAttributeValue/sdb_GetAttributeValue/sqlite3_mprintf/sqlite3MemMalloc

In DBG builds, the new memory leak stacks are different, but very similar:
NSC_GetAttributeValue/sftkdb_GetAttributeValue/sdb_GetAttributeValue/sdb_GetAttributeValueNoLock/sqlite3_mprintf/sqlite3_vmprintf/sqlite3StrAccumFinish/sqlite3DbMallocRaw/sqlite3Malloc/mallocWithAlarm/sqlite3MemMalloc
The memory leak is introduced by the patch checked in
in bug 526231 comment 15.  I will follow up there.
In NSS 3.13, we should not use NO_CHECK_FORK.
This MXR query shows the remaining occurrences
of NO_CHECK_FORK on the NSS trunk, which this
patch fixes:
http://mxr.mozilla.org/security/search?string=NO_CHECK_FORK
Attachment #458857 - Flags: review?(christophe.ravel.bugs)
Comment on attachment 458857 [details] [diff] [review]
Do not use NO_CHECK_FORK

r=christophe
Attachment #458857 - Flags: review?(christophe.ravel.bugs) → review+
Comment on attachment 458857 [details] [diff] [review]
Do not use NO_CHECK_FORK

I checked in this patch on the NSS trunk (NSS 3.13).

Checking in coreconf/Linux2.4.mk;
/cvsroot/mozilla/security/coreconf/Linux2.4.mk,v  <--  Linux2.4.mk
new revision: 1.10; previous revision: 1.9
done
Checking in nss/lib/freebl/blapii.h;
/cvsroot/mozilla/security/nss/lib/freebl/blapii.h,v  <--  blapii.h
new revision: 1.3; previous revision: 1.2
done
Status: NEW → RESOLVED
Closed: 11 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.