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

Check path lengths.

Browse Source
This commit is contained in:
Michael Jumper 2013-12-11 15:00:00 -08:00
parent 89b55ecab5
commit 478235be70
5 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages.c
View File

@ -79,11 +79,9 @@ void guac_rdpdr_fs_process_create(guac_rdpdr_device* device,
Stream_Read_UINT32(input_stream, create_options); Stream_Read_UINT32(input_stream, create_options);
Stream_Read_UINT32(input_stream, path_length); Stream_Read_UINT32(input_stream, path_length);
/* FIXME: Validate path length */
/* Convert path to UTF-8 */ /* Convert path to UTF-8 */
guac_rdp_utf16_to_utf8(Stream_Pointer(input_stream), guac_rdp_utf16_to_utf8(Stream_Pointer(input_stream), path_length/2 - 1,
path, path_length/2 - 1); path, sizeof(path));
/* Open file */ /* Open file */
file_id = guac_rdp_fs_open((guac_rdp_fs*) device->data, path, file_id = guac_rdp_fs_open((guac_rdp_fs*) device->data, path,
@ -482,11 +480,9 @@ void guac_rdpdr_fs_process_query_directory(guac_rdpdr_device* device, wStream* i
Stream_Seek(input_stream, 23); /* Padding */ Stream_Seek(input_stream, 23); /* Padding */
/* FIXME: Validate path length */
/* Convert path to UTF-8 */ /* Convert path to UTF-8 */
guac_rdp_utf16_to_utf8(Stream_Pointer(input_stream), guac_rdp_utf16_to_utf8(Stream_Pointer(input_stream), path_length/2 - 1,
file->dir_pattern, path_length/2 - 1); file->dir_pattern, sizeof(file->dir_pattern));
} }

12
src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_dir_info.c
View File

@ -60,7 +60,8 @@ void guac_rdpdr_fs_process_query_directory_info(guac_rdpdr_device* device,
int utf16_length = length*2; int utf16_length = length*2;
unsigned char utf16_entry_name[256]; unsigned char utf16_entry_name[256];
guac_rdp_utf8_to_utf16((const unsigned char*) entry_name, (char*) utf16_entry_name, length); guac_rdp_utf8_to_utf16((const unsigned char*) entry_name, length,
(char*) utf16_entry_name, sizeof(utf16_entry_name));
/* Get file */ /* Get file */
file = guac_rdp_fs_get_file((guac_rdp_fs*) device->data, file_id); file = guac_rdp_fs_get_file((guac_rdp_fs*) device->data, file_id);
@ -103,7 +104,8 @@ void guac_rdpdr_fs_process_query_full_directory_info(guac_rdpdr_device* device,
int utf16_length = length*2; int utf16_length = length*2;
unsigned char utf16_entry_name[256]; unsigned char utf16_entry_name[256];
guac_rdp_utf8_to_utf16((const unsigned char*) entry_name, (char*) utf16_entry_name, length); guac_rdp_utf8_to_utf16((const unsigned char*) entry_name, length,
(char*) utf16_entry_name, sizeof(utf16_entry_name));
/* Get file */ /* Get file */
file = guac_rdp_fs_get_file((guac_rdp_fs*) device->data, file_id); file = guac_rdp_fs_get_file((guac_rdp_fs*) device->data, file_id);
@ -147,7 +149,8 @@ void guac_rdpdr_fs_process_query_both_directory_info(guac_rdpdr_device* device,
int utf16_length = length*2; int utf16_length = length*2;
unsigned char utf16_entry_name[256]; unsigned char utf16_entry_name[256];
guac_rdp_utf8_to_utf16((const unsigned char*) entry_name, (char*) utf16_entry_name, length); guac_rdp_utf8_to_utf16((const unsigned char*) entry_name, length,
(char*) utf16_entry_name, sizeof(utf16_entry_name));
/* Get file */ /* Get file */
file = guac_rdp_fs_get_file((guac_rdp_fs*) device->data, file_id); file = guac_rdp_fs_get_file((guac_rdp_fs*) device->data, file_id);
@ -195,7 +198,8 @@ void guac_rdpdr_fs_process_query_names_info(guac_rdpdr_device* device,
int utf16_length = length*2; int utf16_length = length*2;
unsigned char utf16_entry_name[256]; unsigned char utf16_entry_name[256];
guac_rdp_utf8_to_utf16((const unsigned char*) entry_name, (char*) utf16_entry_name, length); guac_rdp_utf8_to_utf16((const unsigned char*) entry_name, length,
(char*) utf16_entry_name, sizeof(utf16_entry_name));
/* Get file */ /* Get file */
file = guac_rdp_fs_get_file((guac_rdp_fs*) device->data, file_id); file = guac_rdp_fs_get_file((guac_rdp_fs*) device->data, file_id);

4
src/protocols/rdp/guac_rdpdr/rdpdr_fs_messages_file_info.c
View File

@ -157,8 +157,8 @@ void guac_rdpdr_fs_process_set_rename_info(guac_rdpdr_device* device,
Stream_Read_UINT32(input_stream, filename_length); /* FileNameLength */ Stream_Read_UINT32(input_stream, filename_length); /* FileNameLength */
/* Convert name to UTF-8 */ /* Convert name to UTF-8 */
guac_rdp_utf16_to_utf8(Stream_Pointer(input_stream), guac_rdp_utf16_to_utf8(Stream_Pointer(input_stream), filename_length/2,
destination_path, filename_length/2); destination_path, sizeof(destination_path));
GUAC_RDP_DEBUG(2, "[file_id=%i] destination_path=\"%s\"", file_id, destination_path); GUAC_RDP_DEBUG(2, "[file_id=%i] destination_path=\"%s\"", file_id, destination_path);

15
src/protocols/rdp/unicode.c
View File

@ -39,7 +39,8 @@
#include <guacamole/unicode.h> #include <guacamole/unicode.h>
void guac_rdp_utf16_to_utf8(const unsigned char* utf16, char* utf8, int length) { void guac_rdp_utf16_to_utf8(const unsigned char* utf16, int length,
char* utf8, int size) {
int i; int i;
const uint16_t* in_codepoint = (const uint16_t*) utf16; const uint16_t* in_codepoint = (const uint16_t*) utf16;
@ -51,7 +52,9 @@ void guac_rdp_utf16_to_utf8(const unsigned char* utf16, char* utf8, int length)
uint16_t codepoint = *(in_codepoint++); uint16_t codepoint = *(in_codepoint++);
/* Save codepoint as UTF-8 */ /* Save codepoint as UTF-8 */
utf8 += guac_utf8_write(codepoint, utf8, 4); int bytes_written = guac_utf8_write(codepoint, utf8, size);
size -= bytes_written;
utf8 += bytes_written;
} }
@ -60,7 +63,8 @@ void guac_rdp_utf16_to_utf8(const unsigned char* utf16, char* utf8, int length)
} }
void guac_rdp_utf8_to_utf16(const unsigned char* utf8, char* utf16, int length) { void guac_rdp_utf8_to_utf16(const unsigned char* utf8, int length,
char* utf16, int size) {
int i; int i;
uint16_t* out_codepoint = (uint16_t*) utf16; uint16_t* out_codepoint = (uint16_t*) utf16;
@ -75,6 +79,11 @@ void guac_rdp_utf8_to_utf16(const unsigned char* utf8, char* utf16, int length)
/* Save codepoint as UTF-16 */ /* Save codepoint as UTF-16 */
*(out_codepoint++) = codepoint; *(out_codepoint++) = codepoint;
/* Stop if buffer full */
size -= 2;
if (size < 2)
break;
} }
} }

6
src/protocols/rdp/unicode.h
View File

@ -38,10 +38,12 @@
/** /**
* Convert the given number of UTF-16 characters to UTF-8 characters. * Convert the given number of UTF-16 characters to UTF-8 characters.
*/ */
void guac_rdp_utf16_to_utf8(const unsigned char* utf16, char* utf8, int length); void guac_rdp_utf16_to_utf8(const unsigned char* utf16, int length,
char* utf8, int size);
/** /**
* Convert the given number of UTF-8 characters to UTF-16 characters. * Convert the given number of UTF-8 characters to UTF-16 characters.
*/ */
void guac_rdp_utf8_to_utf16(const unsigned char* utf8, char* utf16, int length); void guac_rdp_utf8_to_utf16(const unsigned char* utf8, int length,
char* utf16, int size);