===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshbuf-getput-crypto.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/ssh/sshbuf-getput-crypto.c	2014/06/18 15:42:09	1.2
+++ src/usr.bin/ssh/sshbuf-getput-crypto.c	2015/01/12 15:18:07	1.3
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sshbuf-getput-crypto.c,v 1.2 2014/06/18 15:42:09 naddy Exp $	*/
+/*	$OpenBSD: sshbuf-getput-crypto.c,v 1.3 2015/01/12 15:18:07 djm Exp $	*/
 /*
  * Copyright (c) 2011 Damien Miller
  *
@@ -189,7 +189,8 @@
 		return r;
 	}
 	POKE_U16(dp, len_bits);
-	memcpy(dp + 2, d, len_bytes);
+	if (len_bytes != 0)
+		memcpy(dp + 2, d, len_bytes);
 	bzero(d, sizeof(d));
 	return 0;
 }