diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2013-11-14 20:30:50 -0800 |
|---|---|---|
| committer | Jay Sorg <jay.sorg@gmail.com> | 2013-11-14 20:30:50 -0800 |
| commit | 57a2cef697c0da6119233ba84a21902a466c9dae (patch) | |
| tree | 5023b459d2a255e42e75633617688944fe09d2e3 /sesman/chansrv/chansrv.c | |
| parent | c20dbff64410ce312112db5eb7e3f2930ed8ba86 (diff) | |
| parent | ea4e531325cb3370b4fbb8b5eef1fc3308e811cc (diff) | |
| download | xrdp-proprietary-57a2cef697c0da6119233ba84a21902a466c9dae.tar.gz xrdp-proprietary-57a2cef697c0da6119233ba84a21902a466c9dae.zip | |
Merge branch 'master' of github.com:neutrinolabs/xrdp
Diffstat (limited to 'sesman/chansrv/chansrv.c')
| -rw-r--r-- | sesman/chansrv/chansrv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c index aed44535..964c7abc 100644 --- a/sesman/chansrv/chansrv.c +++ b/sesman/chansrv/chansrv.c @@ -647,8 +647,9 @@ process_message_channel_data(struct stream *s) { rv = drdynvc_data_in(s, chan_id, chan_flags, length, total_length); } - else if (chan_id == ((struct xrdp_api_data *) - (g_api_con_trans->callback_data))->chan_id) + else if ((g_api_con_trans != 0) && + (chan_id == ((struct xrdp_api_data *) + (g_api_con_trans->callback_data))->chan_id)) { LOG(10, ("process_message_channel_data length %d total_length %d " "chan_flags 0x%8.8x", length, total_length, chan_flags)); |