summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Thomson <mt@lowentropy.net>2020-05-22 02:51:28 +0000
committerMartin Thomson <mt@lowentropy.net>2020-05-22 02:51:28 +0000
commit062f3deb5d6904839c27c9aaa3a8addd4e2fa482 (patch)
treef051dda790d70070d86c14b026d4b061ef72820c
parentc63ac673e7de41f4ce1f3ffc57c7d1b3feb2c1c9 (diff)
downloadnss-hg-062f3deb5d6904839c27c9aaa3a8addd4e2fa482.tar.gz
Bug 1640042 - Don't memcpy nothing, r=jcj
Differential Revision: https://phabricator.services.mozilla.com/D76421
-rw-r--r--lib/ssl/sslsock.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/ssl/sslsock.c b/lib/ssl/sslsock.c
index dba4bd471..9602919e3 100644
--- a/lib/ssl/sslsock.c
+++ b/lib/ssl/sslsock.c
@@ -4472,8 +4472,11 @@ SSLExp_GetResumptionTokenInfo(const PRUint8 *tokenData, unsigned int tokenLen,
if (!token.alpnSelection) {
return SECFailure;
}
- PORT_Memcpy(token.alpnSelection, sid.u.ssl3.alpnSelection.data,
- token.alpnSelectionLen);
+ if (token.alpnSelectionLen > 0) {
+ PORT_Assert(sid.u.ssl3.alpnSelection.data);
+ PORT_Memcpy(token.alpnSelection, sid.u.ssl3.alpnSelection.data,
+ token.alpnSelectionLen);
+ }
if (sid.u.ssl3.locked.sessionTicket.flags & ticket_allow_early_data) {
token.maxEarlyDataSize =