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

GUACAMOLE-637: Clarify purpose of initial empty path component. Fix normalization logic to ensure that empty component is always present.

Browse Source
This commit is contained in:
Michael Jumper 2019-01-23 20:28:09 -08:00
parent 350d8e5995
commit c6feef6c86
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/protocols/rdp/rdp_fs.c
View File

@ -608,12 +608,16 @@ const char* guac_rdp_fs_read_dir(guac_rdp_fs* fs, int file_id) {
int guac_rdp_fs_normalize_path(const char* path, char* abs_path) { int guac_rdp_fs_normalize_path(const char* path, char* abs_path) {
int i; int i;
int path_depth = 1;
char path_component_data[GUAC_RDP_FS_MAX_PATH];
const char* path_components[GUAC_RDP_MAX_PATH_DEPTH] = { "" };
char path_component_data[GUAC_RDP_FS_MAX_PATH];
const char* current_path_component_data = &(path_component_data[0]); const char* current_path_component_data = &(path_component_data[0]);
/* Always include a blank path component at the beginning, such that the
* eventual call to guac_strljoin() will produce an absolute path (leading
* backslash) */
int path_depth = 1;
const char* path_components[GUAC_RDP_MAX_PATH_DEPTH] = { "" };
/* If original path is not absolute, normalization fails */ /* If original path is not absolute, normalization fails */
if (path[0] != '\\' && path[0] != '/') if (path[0] != '\\' && path[0] != '/')
return 1; return 1;
@ -641,7 +645,7 @@ int guac_rdp_fs_normalize_path(const char* path, char* abs_path) {
/* If component refers to parent, just move up in depth */ /* If component refers to parent, just move up in depth */
if (strcmp(current_path_component_data, "..") == 0) { if (strcmp(current_path_component_data, "..") == 0) {
if (path_depth > 0) if (path_depth > 1)
path_depth--; path_depth--;
} }