jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

coverity: improper use of negative value

Browse Source
This commit is contained in:
Laxmikant Rashinkar 2014-07-26 13:33:23 -07:00
parent fde7be5151
commit 27055d5762
13 changed files with 82 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/trans.c
View File

@ -501,12 +501,18 @@ trans_connect(struct trans *self, const char *server, const char *port,
if (self->mode == TRANS_MODE_TCP) /* tcp */
{
self->sck = g_tcp_socket();
if (self->sck < 0)
return 1;
g_tcp_set_non_blocking(self->sck);
error = g_tcp_connect(self->sck, server, port);
}
else if (self->mode == TRANS_MODE_UNIX) /* unix socket */
{
self->sck = g_tcp_local_socket();
if (self->sck < 0)
return 1;
g_tcp_set_non_blocking(self->sck);
error = g_tcp_local_connect(self->sck, port);
}
@ -537,6 +543,10 @@ trans_connect(struct trans *self, const char *server, const char *port,
}
/*****************************************************************************/
/**
* @return 0 on success, 1 on failure
*/
int APP_CC
trans_listen_address(struct trans *self, char *port, const char *address)
{
@ -548,6 +558,9 @@ trans_listen_address(struct trans *self, char *port, const char *address)
if (self->mode == TRANS_MODE_TCP) /* tcp */
{
self->sck = g_tcp_socket();
if (self->sck < 0)
return 1;
g_tcp_set_non_blocking(self->sck);
if (g_tcp_bind_address(self->sck, port, address) == 0)
@ -565,7 +578,11 @@ trans_listen_address(struct trans *self, char *port, const char *address)
g_free(self->listen_filename);
self->listen_filename = 0;
g_file_delete(port);
self->sck = g_tcp_local_socket();
if (self->sck < 0)
return 1;
g_tcp_set_non_blocking(self->sck);
if (g_tcp_local_bind(self->sck, port) == 0)

3
rdp/rdp_rdp.c
View File

@ -1170,6 +1170,9 @@ rdp_rec_check_file(struct rdp_rdp *self)
}
self->rec_fd = g_file_open(file_name);
if (self->rec_fd < 0)
return 1;
make_stream(s);
init_stream(s, 8192);
out_uint8a(s, "XRDPREC1", 8);

3
rdp/rdp_tcp.c
View File

@ -157,7 +157,10 @@ int APP_CC
rdp_tcp_connect(struct rdp_tcp *self, char *ip, char *port)
{
DEBUG((" in rdp_tcp_connect ip %s port %s", ip, port));
self->sck = g_tcp_socket();
if (self->sck < 0)
return 1;
if (g_tcp_connect(self->sck, ip, port) == 0)
{

8
sesman/sesman.c
View File

@ -54,7 +54,14 @@ sesman_main_loop(void)
/*main program loop*/
log_message(LOG_LEVEL_INFO, "listening...");
g_sck = g_tcp_socket();
if (g_sck < 0)
{
log_message(LOG_LEVEL_ERROR, "error opening socket, g_tcp_socket() failed...");
return 1;
}
g_tcp_set_non_blocking(g_sck);
error = scp_tcp_bind(g_sck, g_cfg->listen_address, g_cfg->listen_port);
@ -132,6 +139,7 @@ sesman_main_loop(void)
g_get_errno(), g_get_strerror());
}
if (g_sck != -1)
g_tcp_close(g_sck);
}

12
sesman/session.c
View File

@ -203,27 +203,33 @@ x_server_running_check_ports(int display)
if (!x_running) /* check 59xx */
{
sck = g_tcp_socket();
if ((sck = g_tcp_socket()) != -1)
{
g_sprintf(text, "59%2.2d", display);
x_running = g_tcp_bind(sck, text);
g_tcp_close(sck);
}
}
if (!x_running) /* check 60xx */
{
sck = g_tcp_socket();
if ((sck = g_tcp_socket()) != -1)
{
g_sprintf(text, "60%2.2d", display);
x_running = g_tcp_bind(sck, text);
g_tcp_close(sck);
}
}
if (!x_running) /* check 62xx */
{
sck = g_tcp_socket();
if ((sck = g_tcp_socket()) != -1)
{
g_sprintf(text, "62%2.2d", display);
x_running = g_tcp_bind(sck, text);
g_tcp_close(sck);
}
}
return x_running;
}

6
sesman/tools/sesadmin.c
View File

@ -107,6 +107,12 @@ int main(int argc, char **argv)
scp_init(&logging);
sock = g_tcp_socket();
if (sock < 0)
{
LOG_DBG("Socket open error, g_tcp_socket() failed\n");
return 1;
}
s = scp_session_create();
c = scp_connection_create(sock);

3
sesman/tools/sesrun.c
View File

@ -75,7 +75,10 @@ main(int argc, char **argv)
init_stream(in_s, 8192);
make_stream(out_s);
init_stream(out_s, 8192);
sck = g_tcp_socket();
if (sck < 0)
return 1;
if (g_tcp_connect(sck, argv[1], g_cfg.listen_port) == 0)
{

3
sesman/tools/sestest.c
View File

@ -38,6 +38,9 @@ int main(int argc, char **argv)
scp_init(&log);
sock = g_tcp_socket();
if (sock < 0)
return 1;
s = scp_session_create();
c = scp_connection_create(sock);

7
vnc/vnc.c
View File

@ -967,7 +967,14 @@ lib_mod_connect(struct vnc *v)
make_stream(s);
g_sprintf(con_port, "%s", v->port);
make_stream(pixel_format);
v->sck = g_tcp_socket();
if (v->sck < 0)
{
v->server_msg(v, "VNC error: socket create error, g_tcp_socket() failed", 0);
return 1;
}
v->sck_obj = g_create_wait_obj_from_socket(v->sck, 0);
v->sck_closed = 0;
g_sprintf(text, "VNC connecting to %s %s", v->ip, con_port);

1
xrdp/xrdp_listen.c
View File

@ -244,6 +244,7 @@ xrdp_listen_get_port_address(char *port, int port_bytes,
list_delete(values);
}
if (fd != -1)
g_file_close(fd);
/* startup_param overrides */

3
xrdp/xrdp_login_wnd.c
View File

@ -459,9 +459,10 @@ xrdp_wm_login_fill_in_combo(struct xrdp_wm *self, struct xrdp_bitmap *b)
g_snprintf(cfg_file, 255, "%s/xrdp.ini", XRDP_CFG_PATH);
fd = g_file_open(cfg_file); /* xrdp.ini */
if (fd < 1)
if (fd < 0)
{
log_message(LOG_LEVEL_ERROR, "Could not read xrdp ini file %s", cfg_file);
return 1;
}
file_read_sections(fd, sections);

2
xrdp/xrdp_mm.c
View File

@ -1309,7 +1309,9 @@ xrdp_mm_get_sesman_port(char *port, int port_bytes)
list_delete(values);
}
if (fd != -1)
g_file_close(fd);
return 0;
}

5
xup/xup.c
View File

@ -212,10 +212,15 @@ lib_mod_connect(struct mod *mod)
if (use_uds)
{
mod->sck = g_tcp_local_socket();
if (mod->sck < 0)
return 1;
}
else
{
mod->sck = g_tcp_socket();
if (mod->sck < 0)
return 1;
g_tcp_set_non_blocking(mod->sck);
g_tcp_set_no_delay(mod->sck);
}