===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshbuf-getput-basic.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/ssh/sshbuf-getput-basic.c	2014/12/04 01:49:59	1.2
+++ src/usr.bin/ssh/sshbuf-getput-basic.c	2015/01/12 15:18:07	1.3
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshbuf-getput-basic.c,v 1.2 2014/12/04 01:49:59 djm Exp $	*/
+/*	$OpenBSD: sshbuf-getput-basic.c,v 1.3 2015/01/12 15:18:07 djm Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -32,7 +32,7 @@
 
 	if ((r = sshbuf_consume(buf, len)) < 0)
 		return r;
-	if (v != NULL)
+	if (v != NULL && len != 0)
 		memcpy(v, p, len);
 	return 0;
 }
@@ -107,7 +107,8 @@
 			SSHBUF_DBG(("SSH_ERR_ALLOC_FAIL"));
 			return SSH_ERR_ALLOC_FAIL;
 		}
-		memcpy(*valp, val, len);
+		if (len != 0)
+			memcpy(*valp, val, len);
 		(*valp)[len] = '\0';
 	}
 	if (lenp != NULL)
@@ -198,7 +199,8 @@
 			SSHBUF_DBG(("SSH_ERR_ALLOC_FAIL"));
 			return SSH_ERR_ALLOC_FAIL;
 		}
-		memcpy(*valp, p, len);
+		if (len != 0)
+			memcpy(*valp, p, len);
 		(*valp)[len] = '\0';
 	}
 	if (lenp != NULL)
@@ -234,7 +236,8 @@
 
 	if ((r = sshbuf_reserve(buf, len, &p)) < 0)
 		return r;
-	memcpy(p, v, len);
+	if (len != 0)
+		memcpy(p, v, len);
 	return 0;
 }
 
@@ -350,7 +353,8 @@
 	if ((r = sshbuf_reserve(buf, len + 4, &d)) < 0)
 		return r;
 	POKE_U32(d, len);
-	memcpy(d + 4, v, len);
+	if (len != 0)
+		memcpy(d + 4, v, len);
 	return 0;
 }
 
@@ -414,6 +418,7 @@
 	POKE_U32(d, len + prepend);
 	if (prepend)
 		d[4] = 0;
-	memcpy(d + 4 + prepend, s, len);
+	if (len != 0)
+		memcpy(d + 4 + prepend, s, len);
 	return 0;
 }