Bug 1307526 - Fix various memcpy() calls r=franziskus

Differential Revision: https://nss-dev.phacility.com/D60
sailfishos-mirror · Oct 4, 2016 · 4168e40 · 4168e40
1 parent e22f41b
commit 4168e40
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/lib/softoken/legacydb/keydb.c b/lib/softoken/legacydb/keydb.c
@@ -130,7 +130,9 @@ encode_dbkey(NSSLOWKEYDBKey *dbkey, unsigned char version)
     buf[2] = nnlen;
 
     /* copy salt */
-    PORT_Memcpy(&buf[3], dbkey->salt.data, dbkey->salt.len);
+    if (dbkey->salt.len > 0) {
+        PORT_Memcpy(&buf[3], dbkey->salt.data, dbkey->salt.len);
+    }
 
     /* copy nickname */
     PORT_Memcpy(&buf[3 + dbkey->salt.len], nn, nnlen);

diff --git a/lib/softoken/legacydb/pcertdb.c b/lib/softoken/legacydb/pcertdb.c
@@ -2190,8 +2190,10 @@ EncodeDBSubjectEntry(certDBEntrySubject *entry, PLArenaPool *arena,
         tmpbuf += certKeys[i].len;
     }
     for (i = 0; i < ncerts; i++) {
-        PORT_Memcpy(tmpbuf, keyIDs[i].data, keyIDs[i].len);
-        tmpbuf += keyIDs[i].len;
+        if (keyIDs[i].len) {
+            PORT_Memcpy(tmpbuf, keyIDs[i].data, keyIDs[i].len);
+            tmpbuf += keyIDs[i].len;
+        }
     }
 
     if (entry->emailAddrs) {

diff --git a/lib/util/secasn1e.c b/lib/util/secasn1e.c
@@ -1420,8 +1420,10 @@ sec_asn1e_encode_item_store(void *arg, const char *buf, unsigned long len,
     dest = (SECItem *)arg;
     PORT_Assert(dest != NULL);
 
-    PORT_Memcpy(dest->data + dest->len, buf, len);
-    dest->len += len;
+    if (len > 0) {
+        PORT_Memcpy(dest->data + dest->len, buf, len);
+        dest->len += len;
+    }
 }
 
 /*