maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

__guac_fill_instructionbuf() should report errors.

Browse Source
This commit is contained in:
Michael Jumper 2012-03-15 11:30:52 -07:00
parent eb73b52e69
commit 1aa594bd8b
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libguac/src/protocol.c
View File

@ -180,21 +180,28 @@ int __guac_fill_instructionbuf(guac_socket* socket) {
/* Attempt to fill buffer */ /* Attempt to fill buffer */
retval = recv( retval = recv(
socket->fd, socket->fd,
socket->__instructionbuf + socket->__instructionbuf_used_length, socket->__instructionbuf + socket->__instructionbuf_used_length,
socket->__instructionbuf_size - socket->__instructionbuf_used_length, socket->__instructionbuf_size - socket->__instructionbuf_used_length,
0 0
); );
if (retval < 0) /* Set guac_error if recv() unsuccessful */
if (retval < 0) {
guac_error = GUAC_STATUS_SEE_ERRNO;
guac_error_message = "Error filling instruction buffer";
return retval; return retval;
}
socket->__instructionbuf_used_length += retval; socket->__instructionbuf_used_length += retval;
/* Expand buffer if necessary */ /* Expand buffer if necessary */
if (socket->__instructionbuf_used_length > socket->__instructionbuf_size / 2) { if (socket->__instructionbuf_used_length >
socket->__instructionbuf_size / 2) {
socket->__instructionbuf_size *= 2; socket->__instructionbuf_size *= 2;
socket->__instructionbuf = realloc(socket->__instructionbuf, socket->__instructionbuf_size); socket->__instructionbuf = realloc(socket->__instructionbuf,
socket->__instructionbuf_size);
} }
return retval; return retval;
@ -203,7 +210,8 @@ int __guac_fill_instructionbuf(guac_socket* socket) {
/* Returns new instruction if one exists, or NULL if no more instructions. */ /* Returns new instruction if one exists, or NULL if no more instructions. */
guac_instruction* guac_protocol_read_instruction(guac_socket* socket, int usec_timeout) { guac_instruction* guac_protocol_read_instruction(guac_socket* socket,
int usec_timeout) {
int retval; int retval;