397832 - libpkix leaks memory if a macro calls a function that returns an error. Object leak test. r=nelson

1 files changed, 108 insertions, 4 deletions

diff --git a/security/nss/tests/libpkix/libpkix.sh b/security/nss/tests/libpkix/libpkix.sh
index cfc519d23..7d3b6caab 100755
--- a/security/nss/tests/libpkix/libpkix.sh
+++ b/security/nss/tests/libpkix/libpkix.sh
@@ -83,7 +83,6 @@ libpkix_init()
   LIBPKIX_LOG=${HOSTDIR}/libpkix.log    #we don't want all the errormessages 
          # in the output.log, otherwise we can't tell what's a real error
 
-  html_head "LIBPKIX Tests"
 
 }
 
@@ -104,6 +103,9 @@ libpkix_cleanup()
   . common/cleanup.sh
 }
 
+############################## libpkix_UT_main ############################
+# local shell function to run libpkix unit tests
+########################################################################
 ParseArgs ()
 {
     while [ $# -gt 0 ]; do
@@ -119,9 +121,11 @@ ParseArgs ()
     done
 }
 
-libpkix_main()
+libpkix_UT_main()
 {
 
+html_head "LIBPKIX Unit Tests"
+
 ParseArgs 
 
 echo "*******************************************************************************"
@@ -178,10 +182,110 @@ return 1
 fi
 }
 
+############################## libpkix_setup_db ############################
+# Sets up directory and db for pkix functional test.
+########################################################################
+libpkix_setup_db()
+{
+  fnCaller=$1
+
+  DB_DIR="${HOSTDIR}/libpkix_functional"
+  CERT_DIR="${QADIR}/libpkix/certs"
+  
+  mkdir -p $DB_DIR
+  if [ ! -f ${R_PWFILE} ]; then
+      echo nss > ${R_PWFILE}
+  fi
+  echo "Initializing Cert DB in $FN_DB_DIR"
+  certutil -N -d "${DB_DIR}" -f "${R_PWFILE}" 2>&1
+  RET=$?
+  if [ "$RET" -ne 0 ]; then
+      return $RET
+  fi
+
+  echo "Loading certs into DB at $DB_DIR"
+  output=$TMP/libpkix_setup.tmp
+  while read certName trusts; do
+      certutil -d $DB_DIR -A -n $certName -t $trusts -i $CERT_DIR/$certName.cert > $output 2>&1
+      if [ $? -ne 0 ]; then
+          echo "WARNING: unable to add a certificate($certName) into database"
+          echo "certutil output:"
+          cat $output
+      fi
+      rm -f $output
+  done < $QADIR/libpkix/cert_trust.map
+  
+}
+
+############################## libpkix_leak_test ############################
+# Runs pkix object and memory leak test
+########################################################################
+libpkix_leak_test()
+{
+
+    if [ -n "${MEMLEAK_DBG}" ]; then
+        LOGNAME="libpkix_memleak"
+        LOGFILE=${LOGDIR}/${LOGNAME}.log
+        tmpLogFile=$LOGFILE.tmp
+
+        html_head "Memory leak checking - libpkix"
+    else
+        tmpLogFile=$DB_DIR/libpkix_memoryleak.log
+
+        html_head "LIBPKIX Object Leak Tests"
+    fi 
+    while read status leafCert explPolicy others; do
+        # continue with empty and commented lines. 
+        [ -z "$status" -o "$status" = "#" ] && continue
+
+        # can only run positive tests. Positive validation
+        # status is the exit condition for the code in the library.
+        [ $status -ne 0 ] && continue;
+        extraOpt=""
+        if [ "$explPolicy" -a "$explPolicy" != "undef" ]; then
+            extraOpt="-p -o $explPolicy"
+        fi
+        cmd="vfychain -d $DB_DIR $extraOpt $CERT_DIR/$leafCert.cert"
+        if [ -n "$MEMLEAK_DBG" ]; then
+            cmd="$RUN_COMMAND_DBG $cmd"
+        fi
+        echo $cmd
+        $cmd > $tmpLogFile
+        if [ -z "$MEMLEAK_DBG" ]; then
+            cat $tmpLogFile
+            grep "Memory Leak:" $tmpLogFile
+            html_msg $? 1 "Object leak tests with $leafCert certificate"
+        else
+            cat $tmpLogFile >> $LOGFILE
+        fi
+    done < $QADIR/libpkix/vfychain_test.lst
+
+    if [ -n "${MEMLEAK_DBG}" ]; then
+        log_parse
+        ret=$?
+        html_msg ${ret} 0 "${LOGNAME}" \
+            "produced a returncode of $ret, expected is 0"
+        html "</TABLE><BR>"
+    fi
+}
+
+
 ################## main #################################################
 
 libpkix_init 
-libpkix_main  | tee ${LIBPKIX_LOG}
-libpkix_cleanup
+libpkix_setup_db
+if [ "$PKIX_OBJECT_LEAK_TEST" ]; then
+    libpkix_leak_test
+    if [ -n "${MEMLEAK_DBG}" ]; then
+        libpkix_cleanup
+        return 1
+    fi
+fi
 
+# place other tests here
 
+# Run libpkix unit tests at the end
+if [ "$BUILD_LIBPKIX_TEST" ]; then
+    libpkix_UT_main  | tee ${LIBPKIX_LOG}
+fi
+libpkix_cleanup