diff options
| author | Dorian Johnson <2011@dorianj.net> | 2011-07-04 00:28:36 +0400 |
|---|---|---|
| committer | Dorian Johnson <2011@dorianj.net> | 2011-07-04 00:28:36 +0400 |
| commit | 45fab5b3c1d9274e24cd5d9ef9865468e84d8354 (patch) | |
| tree | 55c60a69500b59858ea0ab2e13271e8d48cb93d2 | |
| parent | 318b256ff34fbd8105fc375c32c02ca36539b642 (diff) | |
| parent | 70399749e1b4370b6abdf9ae8615c17e074e550f (diff) | |
Merge remote branch 'upstream/master'
| -rw-r--r-- | X11/xf_video.c | 3 | ||||
| -rw-r--r-- | libfreerdp-core/rdp.c | 8 | ||||
| -rw-r--r-- | libfreerdp-core/security.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/X11/xf_video.c b/X11/xf_video.c index 8e7dad0..938437e 100644 --- a/X11/xf_video.c +++ b/X11/xf_video.c @@ -120,6 +120,7 @@ xf_video_init(xfInfo * xfi) } xfi->xv_pixfmts[i] = 0; } + XFree(fo); printf("\n"); return 0; @@ -193,7 +194,7 @@ xf_video_process_frame(xfInfo * xfi, RD_VIDEO_FRAME_EVENT * vevent) shminfo.shmid = xfi->xv_shmid; shminfo.shmaddr = image->data = xfi->xv_shmaddr; shminfo.readOnly = False; - + if (!XShmAttach(xfi->display, &shminfo)) { XFree(image); diff --git a/libfreerdp-core/rdp.c b/libfreerdp-core/rdp.c index d3fa364..9ef7db2 100644 --- a/libfreerdp-core/rdp.c +++ b/libfreerdp-core/rdp.c @@ -1706,8 +1706,11 @@ rdp_reconnect(rdpRdp * rdp) username = rdp->redirect_username ? rdp->redirect_username : rdp->settings->username; sec_disconnect(rdp->sec); + network_free(rdp->net); sec_free(rdp->sec); + rdp->sec = sec_new(rdp); + rdp->net = network_new(rdp); if (!network_connect(rdp->net, server, username, rdp->settings->tcp_port_rdp)) return False; @@ -1773,12 +1776,13 @@ rdp_free(rdpRdp * rdp) if (rdp != NULL) { freerdp_uniconv_free(rdp->uniconv); + ext_free(rdp->ext); cache_free(rdp->cache); pcache_free(rdp->pcache); orders_free(rdp->orders); - xfree(rdp->buffer); + network_free(rdp->net); sec_free(rdp->sec); - ext_free(rdp->ext); + xfree(rdp->buffer); xfree(rdp->redirect_server); xfree(rdp->redirect_routingtoken); xfree(rdp->redirect_username); diff --git a/libfreerdp-core/security.c b/libfreerdp-core/security.c index ded9472..b619574 100644 --- a/libfreerdp-core/security.c +++ b/libfreerdp-core/security.c @@ -674,8 +674,6 @@ sec_free(rdpSec * sec) { if (sec != NULL) { - license_free(sec->net->license); - mcs_free(sec->net->mcs); xfree(sec); } } |