Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Jun 2017 06:21:02 +0000 (UTC)
From:      Marcelo Araujo <araujo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r319968 - head/usr.sbin/bhyve
Message-ID:  <201706150621.v5F6L2nF008703@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: araujo
Date: Thu Jun 15 06:21:01 2017
New Revision: 319968
URL: https://svnweb.freebsd.org/changeset/base/319968

Log:
  Initialize variables and use byteorder(9) instead of aliasing char array
  buf via uint32_t pointer.
  
  CID:		1375949
  Reported by:	Coverity, cem
  Reviewed by:	cem
  MFC after:	3 weeks
  Sponsored by:	iXsystems, Inc.
  Differential Revision:	https://reviews.freebsd.org/D11153

Modified:
  head/usr.sbin/bhyve/rfb.c

Modified: head/usr.sbin/bhyve/rfb.c
==============================================================================
--- head/usr.sbin/bhyve/rfb.c	Thu Jun 15 04:49:12 2017	(r319967)
+++ head/usr.sbin/bhyve/rfb.c	Thu Jun 15 06:21:01 2017	(r319968)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #ifndef WITHOUT_CAPSICUM
 #include <sys/capsicum.h>
 #endif
+#include <sys/endian.h>
 #include <sys/socket.h>
 #include <sys/select.h>
 #include <sys/time.h>
@@ -754,7 +755,7 @@ rfb_handle(struct rfb_softc *rc, int cfd)
 {
 	const char *vbuf = "RFB 003.008\n";
 	unsigned char buf[80];
-	unsigned char *message;
+	unsigned char *message = NULL;
 
 #ifndef NO_OPENSSL
 	unsigned char challenge[AUTH_LENGTH];
@@ -766,7 +767,7 @@ rfb_handle(struct rfb_softc *rc, int cfd)
 #endif
 
 	pthread_t tid;
-	uint32_t sres;
+	uint32_t sres = 0;
 	int len;
 
 	rc->cfd = cfd;
@@ -858,7 +859,7 @@ rfb_handle(struct rfb_softc *rc, int cfd)
 	stream_write(cfd, &sres, 4);
 
 	if (sres) {
-		*((uint32_t *) buf) = htonl(strlen(message));
+		be32enc(buf, strlen(message));
 		stream_write(cfd, buf, 4);
 		stream_write(cfd, message, strlen(message));
 		goto done;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706150621.v5F6L2nF008703>