summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEKR <ekr@rtfm.com>2018-10-01 16:20:33 -0700
committerEKR <ekr@rtfm.com>2018-10-01 16:20:33 -0700
commitca302b971d0d498501df74c2ea2f242b88d9505d (patch)
tree635a3120be00294337c276545c0765ad55b74a45
parent6710dfa75cb9af5b1a7995ef0be0ea1a3820df62 (diff)
downloadnss-hg-ca302b971d0d498501df74c2ea2f242b88d9505d.tar.gz
Bug 1495451 - Fix issues flagged by coverity. r=mt
Tags: #secure-revision Bug #: 1495451 Differential Revision: https://phabricator.services.mozilla.com/D7358
-rw-r--r--lib/ssl/tls13con.c1
-rw-r--r--lib/ssl/tls13exthandle.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/ssl/tls13con.c b/lib/ssl/tls13con.c
index cef287a2c..e1698a24d 100644
--- a/lib/ssl/tls13con.c
+++ b/lib/ssl/tls13con.c
@@ -3449,6 +3449,7 @@ tls13_CopyKeyShareEntry(TLS13KeyShareEntry *o)
if (SECSuccess != SECITEM_CopyItem(NULL, &n->key_exchange, &o->key_exchange)) {
PORT_Free(n);
+ return NULL;
}
n->group = o->group;
return n;
diff --git a/lib/ssl/tls13exthandle.c b/lib/ssl/tls13exthandle.c
index cc0ce02b5..8ed18f69c 100644
--- a/lib/ssl/tls13exthandle.c
+++ b/lib/ssl/tls13exthandle.c
@@ -249,6 +249,7 @@ tls13_ClientHandleKeyShareXtn(const sslSocket *ss, TLSExtensionData *xtnData,
}
if (SSL_READER_REMAINING(&rdr)) {
+ tls13_DestroyKeyShareEntry(ks);
PORT_SetError(SSL_ERROR_RX_MALFORMED_KEY_SHARE);
return SECFailure;
}
@@ -1310,6 +1311,9 @@ tls13_ServerHandleEsniXtn(const sslSocket *ss, TLSExtensionData *xtnData,
PRUint64 tmp;
while (SSL_READER_REMAINING(&sniRdr)) {
rv = sslRead_ReadNumber(&sniRdr, 1, &tmp);
+ if (rv != SECSuccess) {
+ goto loser;
+ }
if (tmp != 0) {
goto loser;
}