---

yaml --- r: 328224 b: refs/heads/master c: 4f6e1ca h: refs/heads/master v: v3
git-mirror · Sep 24, 2012 · 7b86f1a · 7b86f1a
1 parent 995ea37
commit 7b86f1a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cd23a7191f1abc32252ba92494a910d5cc5fd02
+refs/heads/master: 4f6e1cafe25df11f4c8afe5d6a3ee051aa6d5de3
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -80,8 +80,10 @@ brcmf_c_mkiovar(char *name, char *data, uint datalen, char *buf, uint buflen)
 	strncpy(buf, name, buflen);
 
 	/* append data onto the end of the name string */
-	memcpy(&buf[len], data, datalen);
-	len += datalen;
+	if (data && datalen) {
+		memcpy(&buf[len], data, datalen);
+		len += datalen;
+	}
 
 	return len;
 }