svn rev #21762: trunk/src/lib/krb5/os/

raeburn@MIT.EDU raeburn at MIT.EDU
Fri Jan 16 20:00:25 EST 2009


http://src.mit.edu/fisheye/changelog/krb5/?cs=21762
Commit By: raeburn
Log Message:
If buffer length is 0, force pointer to NULL, to keep valgrind happier when callers don't bother.


Changed Files:
U   trunk/src/lib/krb5/os/write_msg.c
Modified: trunk/src/lib/krb5/os/write_msg.c
===================================================================
--- trunk/src/lib/krb5/os/write_msg.c	2009-01-17 00:06:06 UTC (rev 21761)
+++ trunk/src/lib/krb5/os/write_msg.c	2009-01-17 01:00:22 UTC (rev 21762)
@@ -52,11 +52,13 @@
 	    nbufs1 = 1;
 	len[0] = htonl(outbuf[0].length);
 	SG_SET(&sg[0], &len[0], 4);
-	SG_SET(&sg[1], outbuf[0].data, outbuf[0].length);
+	SG_SET(&sg[1], outbuf[0].length ? outbuf[0].data : NULL,
+	       outbuf[0].length);
 	if (nbufs1 == 2) {
 	    len[1] = htonl(outbuf[1].length);
 	    SG_SET(&sg[2], &len[1], 4);
-	    SG_SET(&sg[3], outbuf[1].data, outbuf[1].length);
+	    SG_SET(&sg[3], outbuf[1].length ? outbuf[1].data : NULL,
+		   outbuf[1].length);
 	}
 	if (krb5int_net_writev(context, fd, sg, nbufs1 * 2) < 0) {
 	    return errno;




More information about the cvs-krb5 mailing list