summaryrefslogtreecommitdiffstats
path: root/sesman/chansrv/clipboard_file.c
diff options
context:
space:
mode:
authorjsorg71 <jay.sorg@gmail.com>2016-07-22 00:57:49 -0700
committerGitHub <noreply@github.com>2016-07-22 00:57:49 -0700
commit9855b0f922fab1ceacdfdcb6d189a35ba3045d83 (patch)
tree8849815cc449e4fbddace37e007b4ee5face95ac /sesman/chansrv/clipboard_file.c
parent9ccbfb698530966ad51574a8e7e56991f6ef94bd (diff)
parent8f3fb2f7c8ecd993b432796902446e643689b513 (diff)
downloadxrdp-proprietary-9855b0f922fab1ceacdfdcb6d189a35ba3045d83.tar.gz
xrdp-proprietary-9855b0f922fab1ceacdfdcb6d189a35ba3045d83.zip
Merge pull request #403 from kenhys/avoid-chansrv-segv
chansrv: avoid chansrv SEGV when xinode is NULL
Diffstat (limited to 'sesman/chansrv/clipboard_file.c')
-rw-r--r--sesman/chansrv/clipboard_file.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sesman/chansrv/clipboard_file.c b/sesman/chansrv/clipboard_file.c
index 562ee82d..8c2f2189 100644
--- a/sesman/chansrv/clipboard_file.c
+++ b/sesman/chansrv/clipboard_file.c
@@ -660,7 +660,11 @@ clipboard_c2s_in_files(struct stream *s, char *file_list)
"supported [%s]", cfd->cFileName);
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)
{