QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qrexec: use proper unsigned type instead of muting compiler warning

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-02-19 20:54:39 +01:00
parent 1a0d4cae76
commit 3f9cbe63b8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qrexec/qrexec-daemon.c
View File

@ -312,7 +312,8 @@ void handle_message_from_client(int fd)
{ {
struct server_header s_hdr; struct server_header s_hdr;
char buf[MAX_DATA_CHUNK]; char buf[MAX_DATA_CHUNK];
int len, ret; unsigned int len;
int ret;
if (clients[fd].state == CLIENT_CMDLINE) { if (clients[fd].state == CLIENT_CMDLINE) {
handle_cmdline_message_from_client(fd); handle_cmdline_message_from_client(fd);
@ -321,7 +322,7 @@ void handle_message_from_client(int fd)
// We have already passed cmdline from client. // We have already passed cmdline from client.
// Now the client passes us raw data from its stdin. // Now the client passes us raw data from its stdin.
len = buffer_space_vchan_ext(); len = buffer_space_vchan_ext();
if (len <= (int)sizeof s_hdr) if (len <= sizeof s_hdr)
return; return;
/* Read at most the amount of data that we have room for in vchan */ /* Read at most the amount of data that we have room for in vchan */
ret = read(fd, buf, len - sizeof(s_hdr)); ret = read(fd, buf, len - sizeof(s_hdr));
@ -669,7 +670,7 @@ int main(int argc, char **argv)
for (;;) { for (;;) {
max = fill_fdsets_for_select(&read_fdset, &write_fdset); max = fill_fdsets_for_select(&read_fdset, &write_fdset);
if (buffer_space_vchan_ext() <= if (buffer_space_vchan_ext() <=
(int)sizeof(struct server_header)) sizeof(struct server_header))
FD_ZERO(&read_fdset); // vchan full - don't read from clients FD_ZERO(&read_fdset); // vchan full - don't read from clients
sigprocmask(SIG_BLOCK, &chld_set, NULL); sigprocmask(SIG_BLOCK, &chld_set, NULL);