d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize variables and use byteorder(9) instead of aliasing char array

Browse Source 
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
This commit is contained in:
araujo 2017-06-15 06:21:01 +00:00
parent 2fb57a0d05
commit 9925765730
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/bhyve/rfb.c
View File

@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
#ifndef WITHOUT_CAPSICUM #ifndef WITHOUT_CAPSICUM
#include <sys/capsicum.h> #include <sys/capsicum.h>
#endif #endif
#include <sys/endian.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/select.h> #include <sys/select.h>
#include <sys/time.h> #include <sys/time.h>
@ -754,7 +755,7 @@ rfb_handle(struct rfb_softc *rc, int cfd)
{ {
const char *vbuf = "RFB 003.008\n"; const char *vbuf = "RFB 003.008\n";
unsigned char buf[80]; unsigned char buf[80];
unsigned char *message; unsigned char *message = NULL;
#ifndef NO_OPENSSL #ifndef NO_OPENSSL
unsigned char challenge[AUTH_LENGTH]; unsigned char challenge[AUTH_LENGTH];
@ -766,7 +767,7 @@ rfb_handle(struct rfb_softc *rc, int cfd)
#endif #endif
pthread_t tid; pthread_t tid;
uint32_t sres; uint32_t sres = 0;
int len; int len;
rc->cfd = cfd; rc->cfd = cfd;
@ -858,7 +859,7 @@ rfb_handle(struct rfb_softc *rc, int cfd)
stream_write(cfd, &sres, 4); stream_write(cfd, &sres, 4);
if (sres) { if (sres) {
*((uint32_t *) buf) = htonl(strlen(message)); be32enc(buf, strlen(message));
stream_write(cfd, buf, 4); stream_write(cfd, buf, 4);
stream_write(cfd, message, strlen(message)); stream_write(cfd, message, strlen(message));
goto done; goto done;