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

Ignore write access request if file is a directory.

Browse Source
This commit is contained in:
Michael Jumper 2013-12-11 01:25:40 -08:00
parent 6d88bec136
commit 338b83a3a7
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,6 +264,7 @@ int guac_rdp_fs_open(guac_rdp_fs* fs, const char* path,
/* Create directory first, if necessary */ /* Create directory first, if necessary */
if ((create_options & FILE_DIRECTORY_FILE) && (flags & O_CREAT)) { if ((create_options & FILE_DIRECTORY_FILE) && (flags & O_CREAT)) {
/* Create directory */
if (mkdir(real_path, S_IRWXU)) { if (mkdir(real_path, S_IRWXU)) {
if (errno != EEXIST || (flags & O_EXCL)) { if (errno != EEXIST || (flags & O_EXCL)) {
GUAC_RDP_DEBUG(1, "mkdir() failed: %s", strerror(errno)); GUAC_RDP_DEBUG(1, "mkdir() failed: %s", strerror(errno));
@ -281,6 +282,14 @@ int guac_rdp_fs_open(guac_rdp_fs* fs, const char* path,
/* Open file */ /* Open file */
fd = open(real_path, flags, S_IRUSR | S_IWUSR); fd = open(real_path, flags, S_IRUSR | S_IWUSR);
/* If file open failed as we're trying to write a dir, retry as read-only */
if (fd == -1 && errno == EISDIR) {
flags &= ~(O_WRONLY | O_RDWR);
flags |= O_RDONLY;
fd = open(real_path, flags, S_IRUSR | S_IWUSR);
}
if (fd == -1) { if (fd == -1) {
GUAC_RDP_DEBUG(1, "open() failed: %s", strerror(errno)); GUAC_RDP_DEBUG(1, "open() failed: %s", strerror(errno));
return guac_rdp_fs_get_errorcode(errno); return guac_rdp_fs_get_errorcode(errno);