mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1481 from matt335672/cppc-chansrv-fuse 

chansrv-fuse Fix cppcheck 1.89+1.90 warnings
This commit is contained in:
metalefty 2020-02-18 21:46:12 +09:00 committed by GitHub
parent 6d7cce3d34 77686bf832
commit b859457187
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sesman/chansrv/chansrv_fuse.c
View File

@ -2537,6 +2537,8 @@ static char *get_name_for_entry_in_parent(fuse_ino_t parent, const char *name)
strlen(result) + 1 + strlen(name) + 1);
if (p == NULL)
{
/* See cppcheck trac #9292 and #9437 */
/* cppcheck-suppress doubleFree symbolName=result */
free(result);
result = NULL;
}

24
sesman/chansrv/devredir.c
View File

@ -185,28 +185,10 @@ devredir_init(void)
{
struct stream *s;
int bytes;
int fd;
union _u
{
tui32 clientID;
char buf[4];
} u;
tui32 clientID;
/* get a random number that will act as a unique clientID */
if ((fd = open("/dev/urandom", O_RDONLY)) != -1)
{
if (read(fd, u.buf, 4) != 4)
{
}
close(fd);
}
else
{
/* /dev/urandom did not work - use address of struct s */
tui64 u64 = (tui64) (tintptr) &s;
u.clientID = (tui32) u64;
}
g_random((char *) &clientID, sizeof(clientID));
/* setup stream */
xstream_new(s, 1024);
@ -216,7 +198,7 @@ devredir_init(void)
xstream_wr_u16_le(s, PAKID_CORE_SERVER_ANNOUNCE);
xstream_wr_u16_le(s, 0x0001); /* server major ver */
xstream_wr_u16_le(s, 0x000C); /* server minor ver - pretend 2 b Win 7 */
xstream_wr_u32_le(s, u.clientID); /* unique ClientID */
xstream_wr_u32_le(s, clientID); /* unique ClientID */
/* send data to client */
bytes = xstream_len(s);