jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #403 from kenhys/avoid-chansrv-segv

Browse Source 
chansrv: avoid chansrv SEGV when xinode is NULL
This commit is contained in:
jsorg71 2016-07-22 00:57:49 -07:00 committed by GitHub
commit 9855b0f922
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sesman/chansrv/chansrv_fuse.c
View File

@ -780,6 +780,11 @@ int xfuse_add_clip_dir_item(char *filename, int flags, int size, int lindex)
2, /* parent inode */ 2, /* parent inode */
filename, filename,
S_IFREG); S_IFREG);
if (xinode == NULL)
{
log_debug("failed to create file in xrdp filesystem");
return -1;
}
xinode->size = size; xinode->size = size;
xinode->lindex = lindex; xinode->lindex = lindex;
xinode->is_loc_resource = 1; xinode->is_loc_resource = 1;

6
sesman/chansrv/clipboard_file.c
View File

@ -660,7 +660,11 @@ clipboard_c2s_in_files(struct stream *s, char *file_list)
"supported [%s]", cfd->cFileName); "supported [%s]", cfd->cFileName);
continue; continue;
} }
xfuse_add_clip_dir_item(cfd->cFileName, 0, cfd->fileSizeLow, lindex); if (xfuse_add_clip_dir_item(cfd->cFileName, 0, cfd->fileSizeLow, lindex) == -1)
{
log_error("clipboard_c2s_in_files: failed to add clip dir item");
continue;
}
if (file_count > 0) if (file_count > 0)
{ {