summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Taubert <ttaubert@mozilla.com>2016-10-05 07:53:30 +0200
committerTim Taubert <ttaubert@mozilla.com>2016-10-05 07:53:30 +0200
commitb15587059704dd18f62a09a080d854ae44c1189d (patch)
tree8c4e82eaa7dfe5032016f9aca72a20c66dd139f4
parent2344212e44850df3b4cf142d2312dd5b088fb916 (diff)
downloadnspr-hg-b15587059704dd18f62a09a080d854ae44c1189d.tar.gz
Bug 1306958 - Fix PR_GetUniqueIdentity() to not memcpy() when initializing identity_cache r=wtc
-rw-r--r--pr/src/io/prlayer.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/pr/src/io/prlayer.c b/pr/src/io/prlayer.c
index cadb7ca3..c01a2452 100644
--- a/pr/src/io/prlayer.c
+++ b/pr/src/io/prlayer.c
@@ -652,9 +652,11 @@ retry:
if ((NULL != names) && (identity < length))
{
/* what we did is still okay */
- memcpy(
- names, identity_cache.name,
- identity_cache.length * sizeof(char*));
+ if (identity_cache.length != 0) {
+ memcpy(
+ names, identity_cache.name,
+ identity_cache.length * sizeof(char*));
+ }
old = identity_cache.name;
identity_cache.name = names;
identity_cache.length = length;