colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serial: fix handling errors in virtual serial ports

Browse Source 
The g_socket_receive() method returns a signed size variable, so don't
use an unsigned variable to hold the result.
This commit is contained in:
Aleksander Morgado
2017-01-26 14:36:02 +01:00
parent c8ec731043
commit 3de34e94cc
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/mm-port-serial.c
View File

@@ -974,12 +974,14 @@ common_input_available (MMPortSerial *self,
g_clear_error (&error); g_clear_error (&error);
} }
} else if (self->priv->socket) { } else if (self->priv->socket) {
bytes_read = g_socket_receive (self->priv->socket, gssize sbytes_read;
sbytes_read = g_socket_receive (self->priv->socket,
buf, buf,
SERIAL_BUF_SIZE, SERIAL_BUF_SIZE,
NULL, /* cancellable */ NULL, /* cancellable */
&error); &error);
if (bytes_read == -1) { if (sbytes_read < 0) {
bytes_read = 0; bytes_read = 0;
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
status = G_IO_STATUS_AGAIN; status = G_IO_STATUS_AGAIN;
@@ -989,9 +991,11 @@ common_input_available (MMPortSerial *self,
mm_port_get_device (MM_PORT (self)), mm_port_get_device (MM_PORT (self)),
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
} else } else {
bytes_read = (gsize) sbytes_read;
status = G_IO_STATUS_NORMAL; status = G_IO_STATUS_NORMAL;
} }
}
/* If no bytes read, just wait for more data */ /* If no bytes read, just wait for more data */
if (bytes_read == 0) if (bytes_read == 0)