diff options
| author | Idan Freiberg <speidy@gmail.com> | 2014-07-23 16:44:59 +0300 |
|---|---|---|
| committer | Idan Freiberg <speidy@gmail.com> | 2014-07-23 16:44:59 +0300 |
| commit | 16929efb059e1e29c826388e5d57be82014d241b (patch) | |
| tree | f8661e7495a82a4a73e68825f1a1ff44a9e100f1 /sesman/chansrv/rail.c | |
| parent | 0795400fe260652f6ae3788325e2a4c8ee05fe3a (diff) | |
| parent | 0c63a8feb3c52de98a5da51a0a0f743450c34645 (diff) | |
| download | xrdp-proprietary-16929efb059e1e29c826388e5d57be82014d241b.tar.gz xrdp-proprietary-16929efb059e1e29c826388e5d57be82014d241b.zip | |
Merge branch 'devel' of https://github.com/neutrinolabs/xrdp into
devel
Conflicts:
libxrdp/xrdp_sec.c
Diffstat (limited to 'sesman/chansrv/rail.c')
| -rw-r--r-- | sesman/chansrv/rail.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sesman/chansrv/rail.c b/sesman/chansrv/rail.c index 4888d2e0..f3777970 100644 --- a/sesman/chansrv/rail.c +++ b/sesman/chansrv/rail.c @@ -739,7 +739,7 @@ rail_win_get_state(Window win) (unsigned char **)&data, &nitems); - if (data || nitems > 0) + if (data && nitems > 0) { rv = *(unsigned long *)data; XFree(data); @@ -1254,6 +1254,7 @@ rail_win_send_text(Window win) else { LOG(0, ("chansrv::rail_win_send_text: error rail_get_window_data_safe failed")); + g_free(data); return 1; } if (data && len > 0) |