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

Reject invalid instructions.

Browse Source
This commit is contained in:
Michael Jumper 2011-11-25 23:48:45 -08:00
parent e99b470f71
commit 7bca78c7a8
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libguac/src/protocol.c
View File

@ -368,7 +368,7 @@ guac_instruction* guac_protocol_read_instruction(guac_socket* socket, int usec_t
/* Length of element */ /* Length of element */
int element_length = 0; int element_length = 0;
/* Parse instruction in buffe */ /* Parse instruction in buffer */
while (i < socket->__instructionbuf_used_length) { while (i < socket->__instructionbuf_used_length) {
/* Read character from buffer */ /* Read character from buffer */
@ -391,8 +391,8 @@ guac_instruction* guac_protocol_read_instruction(guac_socket* socket, int usec_t
char terminator = elementv[element_length]; char terminator = elementv[element_length];
elementv[element_length] = '\0'; elementv[element_length] = '\0';
/* Move to terminator of element */ /* Move to char after terminator of element */
i += element_length; i += element_length+1;
/* Reset element length */ /* Reset element length */
element_length = 0; element_length = 0;
@ -471,6 +471,12 @@ guac_instruction* guac_protocol_read_instruction(guac_socket* socket, int usec_t
} /* end if terminator */ } /* end if terminator */
/* Error if expected comma is not present */
else if (terminator != ',') {
guac_error = GUAC_STATUS_BAD_ARGUMENT;
return NULL;
}
} /* end if element fully read */ } /* end if element fully read */
/* Otherwise, read more data */ /* Otherwise, read more data */
@ -479,6 +485,12 @@ guac_instruction* guac_protocol_read_instruction(guac_socket* socket, int usec_t
} }
/* Error if length is non-numeric or does not end in a period */
else {
guac_error = GUAC_STATUS_BAD_ARGUMENT;
return NULL;
}
} }
/* No instruction yet? Get more data ... */ /* No instruction yet? Get more data ... */