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

Merge pull request #130 from glyptodon/out-of-bounds

Browse Source 
GUAC-236: Do not exceed available buffers/layers/streams.
This commit is contained in:
James Muehlner 2016-03-16 22:10:37 -07:00
commit 3614c48240
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/guacenc/display-buffers.c
View File

@ -37,7 +37,7 @@ guacenc_buffer* guacenc_display_get_buffer(guacenc_display* display,
int internal_index = -index - 1; int internal_index = -index - 1;
/* Do not lookup / allocate if index is invalid */ /* Do not lookup / allocate if index is invalid */
if (internal_index < 0 || internal_index > GUACENC_DISPLAY_MAX_BUFFERS) { if (internal_index < 0 || internal_index >= GUACENC_DISPLAY_MAX_BUFFERS) {
guacenc_log(GUAC_LOG_WARNING, "Buffer index out of bounds: %i", index); guacenc_log(GUAC_LOG_WARNING, "Buffer index out of bounds: %i", index);
return NULL; return NULL;
} }
@ -72,7 +72,7 @@ int guacenc_display_free_buffer(guacenc_display* display,
int internal_index = -index - 1; int internal_index = -index - 1;
/* Do not lookup / free if index is invalid */ /* Do not lookup / free if index is invalid */
if (internal_index < 0 || internal_index > GUACENC_DISPLAY_MAX_BUFFERS) { if (internal_index < 0 || internal_index >= GUACENC_DISPLAY_MAX_BUFFERS) {
guacenc_log(GUAC_LOG_WARNING, "Buffer index out of bounds: %i", index); guacenc_log(GUAC_LOG_WARNING, "Buffer index out of bounds: %i", index);
return 1; return 1;
} }

6
src/guacenc/display-image-streams.c
View File

@ -33,7 +33,7 @@ int guacenc_display_create_image_stream(guacenc_display* display, int index,
int mask, int layer_index, const char* mimetype, int x, int y) { int mask, int layer_index, const char* mimetype, int x, int y) {
/* Do not lookup / allocate if index is invalid */ /* Do not lookup / allocate if index is invalid */
if (index < 0 || index > GUACENC_DISPLAY_MAX_STREAMS) { if (index < 0 || index >= GUACENC_DISPLAY_MAX_STREAMS) {
guacenc_log(GUAC_LOG_WARNING, "Stream index out of bounds: %i", index); guacenc_log(GUAC_LOG_WARNING, "Stream index out of bounds: %i", index);
return 1; return 1;
} }
@ -54,7 +54,7 @@ guacenc_image_stream* guacenc_display_get_image_stream(
guacenc_display* display, int index) { guacenc_display* display, int index) {
/* Do not lookup / allocate if index is invalid */ /* Do not lookup / allocate if index is invalid */
if (index < 0 || index > GUACENC_DISPLAY_MAX_STREAMS) { if (index < 0 || index >= GUACENC_DISPLAY_MAX_STREAMS) {
guacenc_log(GUAC_LOG_WARNING, "Stream index out of bounds: %i", index); guacenc_log(GUAC_LOG_WARNING, "Stream index out of bounds: %i", index);
return NULL; return NULL;
} }
@ -67,7 +67,7 @@ guacenc_image_stream* guacenc_display_get_image_stream(
int guacenc_display_free_image_stream(guacenc_display* display, int index) { int guacenc_display_free_image_stream(guacenc_display* display, int index) {
/* Do not lookup / allocate if index is invalid */ /* Do not lookup / allocate if index is invalid */
if (index < 0 || index > GUACENC_DISPLAY_MAX_STREAMS) { if (index < 0 || index >= GUACENC_DISPLAY_MAX_STREAMS) {
guacenc_log(GUAC_LOG_WARNING, "Stream index out of bounds: %i", index); guacenc_log(GUAC_LOG_WARNING, "Stream index out of bounds: %i", index);
return 1; return 1;
} }

4
src/guacenc/display-layers.c
View File

@ -33,7 +33,7 @@ guacenc_layer* guacenc_display_get_layer(guacenc_display* display,
int index) { int index) {
/* Do not lookup / allocate if index is invalid */ /* Do not lookup / allocate if index is invalid */
if (index < 0 || index > GUACENC_DISPLAY_MAX_LAYERS) { if (index < 0 || index >= GUACENC_DISPLAY_MAX_LAYERS) {
guacenc_log(GUAC_LOG_WARNING, "Layer index out of bounds: %i", index); guacenc_log(GUAC_LOG_WARNING, "Layer index out of bounds: %i", index);
return NULL; return NULL;
} }
@ -85,7 +85,7 @@ int guacenc_display_free_layer(guacenc_display* display,
int index) { int index) {
/* Do not lookup / free if index is invalid */ /* Do not lookup / free if index is invalid */
if (index < 0 || index > GUACENC_DISPLAY_MAX_LAYERS) { if (index < 0 || index >= GUACENC_DISPLAY_MAX_LAYERS) {
guacenc_log(GUAC_LOG_WARNING, "Layer index out of bounds: %i", index); guacenc_log(GUAC_LOG_WARNING, "Layer index out of bounds: %i", index);
return 1; return 1;
} }