Bug 1061725 - Fix CERT_DecodeTrustString() to call PORT_SetError() if trust string is invalid. r=emaldonaNSS_3_18_BETA7

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/certdb/certdb.c b/lib/certdb/certdb.c
index 1d18c5c33..2581be227 100644
--- a/lib/certdb/certdb.c
+++ b/lib/certdb/certdb.c
@@ -2316,7 +2316,7 @@ CERT_DecodeTrustString(CERTCertTrust *trust, const char *trusts)
 {
     unsigned int i;
     unsigned int *pflags;
-    
+
     if (!trust) {
 	PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	return SECFailure;
@@ -2330,7 +2330,7 @@ CERT_DecodeTrustString(CERTCertTrust *trust, const char *trusts)
     }
 
     pflags = &trust->sslFlags;
-    
+
     for (i=0; i < PORT_Strlen(trusts); i++) {
 	switch (trusts[i]) {
 	  case 'p':
@@ -2376,6 +2376,7 @@ CERT_DecodeTrustString(CERTCertTrust *trust, const char *trusts)
 	      }
 	      break;
 	  default:
+              PORT_SetError(SEC_ERROR_INVALID_ARGS);
 	      return SECFailure;
 	}
     }