bug 363827 - added reporting bug IDs, fixed status reporting, updated list of leaks; r=alexei, sr=christophe

2 files changed, 36 insertions, 11 deletions

diff --git a/security/nss/tests/memleak/ignored b/security/nss/tests/memleak/ignored
index b4b7f0aa6..be731eefa 100644
--- a/security/nss/tests/memleak/ignored
+++ b/security/nss/tests/memleak/ignored
@@ -1,26 +1,33 @@
 #129218
-/main/PL_CreateOptState/PR_Calloc/calloc
-/main/PL_CreateOptState/PR_Malloc/malloc
-/main/PL_CreateOptState/PR_Malloc
-/main/PL_strdup/malloc
-/main/PL_strdup
+/main/PL_CreateOptState/**
+/main/PL_strdup/**
 /main/PR_NewLock/PR_Calloc/calloc
 
 #291225
 /main/NSS_Initialize/*/SECMOD_LoadModule/**
+/SECMOD_LoadModule/**
+/SECMOD_LoadPKCS11Module/**
+/*/SECMOD_LoadModule/**
+
+#361089
+/secmod_ModuleInit/FC_Initialize/sftk_fipsPowerUpSelfTest/sftk_fips_ECDSA_PowerUpSelfTest/sftk_fips_ECDSA_Test/ECDSA_VerifyDigest/**
+/sftk_fips_ECDSA_PowerUpSelfTest/sftk_fips_ECDSA_Test/EC_NewKeyFromSeed/**
+/sftk_fipsPowerUpSelfTest/sftk_fips_ECDSA_PowerUpSelfTest/sftk_fips_ECDSA_Test/ECDSA_SignDigestWithSeed/**
+/sftk_fipsPowerUpSelfTest/sftk_fips_ECDSA_PowerUpSelfTest/sftk_fips_ECDSA_Test/ECDSA_VerifyDigest/**
 
 #366553
 /main/server_main/SSL_ConfigSecureServer/CERT_GetSSLCACerts/**
 
 #366557
 /main/_strdup
-/main/strdup/malloc
+/main/strdup/**
 
 #367133
 /main/NSS_Initialize/*/STAN_LoadDefaultNSS3TrustDomain/**
 
 #367374
 /main/PR_Init/_PR_ImplicitInitialization/_PR_InitStuff/**
+/main/PR_Init/_PR_InitStuff/**
 
 #367376
 /main/launch_threads/PR_CreateThread/_PR_CreateThread/pthread_create@@GLIBC_2.1/**
@@ -28,4 +35,8 @@
 
 #367384
 /main/NSS_Initialize/nss_Init/SECMOD_LoadModule/SECMOD_LoadModule/SECMOD_LoadPKCS11Module/secmod_ModuleInit/NSC_Initialize/nsc_CommonInitialize/RNG_RNGInit/freebl_RunLoaderOnce/PR_CallOnce/freebl_LoadDSO/bl_LoadLibrary/bl_LoadFreeblLibInSoftokenDir/PR_LoadLibraryWithFlags/pr_LoadLibraryByPathname/dlopen@@GLIBC_2.1/**
-/main/NSS_Initialize/nss_Init/nss_FindExternalRoot/SECMOD_AddNewModule/SECMOD_AddNewModuleEx/SECMOD_AddModule/SECMOD_LoadPKCS11Module/PR_LoadLibrary/PR_LoadLibraryWithFlags/pr_LoadLibraryByPathname/DLLErrorInternal/**
\ No newline at end of file
+/main/NSS_Initialize/nss_Init/nss_FindExternalRoot/SECMOD_AddNewModule/SECMOD_AddNewModuleEx/SECMOD_AddModule/SECMOD_LoadPKCS11Module/PR_LoadLibrary/PR_LoadLibraryWithFlags/pr_LoadLibraryByPathname/DLLErrorInternal/**
+
+#370536
+/main/NSS_Shutdown/STAN_Shutdown/NSSTrustDomain_Destroy/nssListIterator_Destroy/nssList_Destroy/NSSArena_Destroy/nssArena_Destroy/arena_remove_pointer/nssPointerTracker_remove/PL_HashTableRemove/PL_HashTableRawRemove/DefaultAllocTable/PR_Malloc/malloc
+
diff --git a/security/nss/tests/memleak/memleak.sh b/security/nss/tests/memleak/memleak.sh
index 433ca90d3..0d51b1dbf 100644
--- a/security/nss/tests/memleak/memleak.sh
+++ b/security/nss/tests/memleak/memleak.sh
@@ -13,7 +13,7 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The original code is the Network Security Services (NSS)
+# The Original Code is the Network Security Services (NSS)
 #
 # The Initial Developer of the Original Code is
 # Sun Microsystems, Inc.
@@ -21,7 +21,7 @@
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-#   Slavomir Katuscak <slavomir.katuscak@sun.com>, Sun Microsystems Laboratories
+#   Slavomir Katuscak <slavomir.katuscak@sun.com>, Sun Microsystems
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -588,6 +588,8 @@ parse_logfile_valgrind()
 ########################################################################
 log_compare()
 {
+	BUG_ID=""
+
 	while read line
 	do
 		LINE="${line}"
@@ -598,6 +600,12 @@ log_compare()
 		fi
 		
 		NEXT=0
+
+		echo "${LINE}" | grep '^#' > /dev/null
+		if [ $? -eq 0 ] ; then
+			BUG_ID="${LINE}"
+			NEXT=1
+		fi
 		
 		echo "${LINE}" | grep '*' > /dev/null
 		if [ $? -ne 0 ] ; then
@@ -650,7 +658,11 @@ check_ignored()
 	do
 		log_compare < ${IGNORED_STACKS}
 		if [ $? -eq 0 ] ; then
-			echo "IGNORED STACK: ${stack}"
+			if [ ${BUG_ID} != "" ] ; then
+				echo "IGNORED STACK (${BUG_ID}): ${stack}"
+			else
+				echo "IGNORED STACK: ${stack}"
+			fi
 		else
 			ret=1
 			echo "NEW STACK: ${stack}"
@@ -666,8 +678,10 @@ check_ignored()
 log_parse()
 {
 	echo "${SCRIPTNAME}: Processing log ${LOGNAME}:"
-	${PARSE_LOGFILE} < ${LOGFILE} | sort -u | check_ignored
+	${PARSE_LOGFILE} < ${LOGFILE} > ${TMP_STACKS}
+	cat ${TMP_STACKS} | sort -u | check_ignored
 	ret=$?
+	rm ${TMP_STACKS}
 	echo ""
 
 	return ${ret}