Reset pointer to NULL after free.

(cherry picked from commit 33c7f808154c6682d3b84526a46d79f3e8d5c1ac)

diff --git a/channels/drdynvc/client/drdynvc_main.c b/channels/drdynvc/client/drdynvc_main.c
index d3f8fa2..5ebd37d 100644 (file)
--- a/channels/drdynvc/client/drdynvc_main.c
+++ b/channels/drdynvc/client/drdynvc_main.c
@@ -347,6 +347,7 @@ static void dvcman_channel_free(void* arg)
                if (channel->channel_callback)
                {
                        IFCALL(channel->channel_callback->OnClose, channel->channel_callback);
+                       channel->channel_callback = NULL;
                }
 
                if (channel->status == CHANNEL_RC_OK)

diff --git a/channels/rdpgfx/client/rdpgfx_main.c b/channels/rdpgfx/client/rdpgfx_main.c
index 8b9f160..6ca75bd 100644 (file)
--- a/channels/rdpgfx/client/rdpgfx_main.c
+++ b/channels/rdpgfx/client/rdpgfx_main.c
@@ -1826,12 +1826,6 @@ static UINT rdpgfx_on_close(IWTSVirtualChannelCallback* pChannelCallback)
        free_surfaces(context, gfx->SurfaceTable);
        evict_cache_slots(context, gfx->MaxCacheSlots, gfx->CacheSlots);
 
-       if (gfx->listener_callback)
-       {
-               free(gfx->listener_callback);
-               gfx->listener_callback = NULL;
-       }
-
        free(callback);
        gfx->UnacknowledgedFrames = 0;
        gfx->TotalDecodedFrames = 0;