diff options
| author | EKR <ekr@rtfm.com> | 2018-01-02 21:25:15 -0800 |
|---|---|---|
| committer | EKR <ekr@rtfm.com> | 2018-01-02 21:25:15 -0800 |
| commit | 3698160484e0f9ca21bcf4b028787349a67dd8a6 (patch) | |
| tree | 1f03155bc3f30951b5854f8f6804cae0c523e08f /lib | |
| parent | 1c6cb4d20a512631ec68c001af10696e8315c69e (diff) | |
| download | nss-hg-3698160484e0f9ca21bcf4b028787349a67dd8a6.tar.gz | |
Bug 1427673 - Fix NULL pointer to PORT_Memcpy(). r=mt
Reviewers: mt
Bug #: 1427673
Differential Revision: https://phabricator.services.mozilla.com/D348
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/sslencode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssl/sslencode.c b/lib/ssl/sslencode.c index 2f127fe8f..f92b74255 100644 --- a/lib/ssl/sslencode.c +++ b/lib/ssl/sslencode.c @@ -95,7 +95,10 @@ sslBuffer_AppendVariable(sslBuffer *b, const PRUint8 *data, unsigned int len, ssl_EncodeUintX(SSL_BUFFER_NEXT(b), len, size); b->len += size; - PORT_Memcpy(SSL_BUFFER_NEXT(b), data, len); + if (len != 0) { + /* We sometimes pass NULL, 0 and memcpy() doesn't want NULL. */ + PORT_Memcpy(SSL_BUFFER_NEXT(b), data, len); + } b->len += len; return SECSuccess; } |