jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

freerdp memory leak fix

Browse Source
This commit is contained in:
Jay Sorg 2012-02-07 22:33:12 -08:00
parent 0e92c14b19
commit 9657a5e2d9
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
freerdp1/xrdp-freerdp.c
View File

@ -165,7 +165,7 @@ lxrdp_event(struct mod* mod, int msg, long param1, long param2,
total_size = (int)param4; total_size = (int)param4;
if ((chanid < 0) || (chanid >= mod->inst->settings->num_channels)) if ((chanid < 0) || (chanid >= mod->inst->settings->num_channels))
{ {
g_writeln("lxrdp_event: error chanid %d", chanid); LLOGLN(0, ("lxrdp_event: error chanid %d", chanid));
break; break;
} }
lchid = mod->inst->settings->channels[chanid].channel_id; lchid = mod->inst->settings->channels[chanid].channel_id;
@ -199,12 +199,6 @@ lxrdp_event(struct mod* mod, int msg, long param1, long param2,
mod->chan_buf_valid += size; mod->chan_buf_valid += size;
break; break;
} }
//g_writeln("got channel data from client chanid %d flags %d size %d "
// "data %p total_size %d -- %p",
// chanid, flags, size, data, total_size,
// mod->inst->SendChannelData);
break; break;
} }
return 0; return 0;
@ -224,6 +218,20 @@ lxrdp_signal(struct mod* mod)
static int DEFAULT_CC static int DEFAULT_CC
lxrdp_end(struct mod* mod) lxrdp_end(struct mod* mod)
{ {
int i;
int j;
for (j = 0; j < 4; j++)
{
for (i = 0; i < 4096; i++)
{
g_free(mod->bitmap_cache[j][i].data);
}
}
for (i = 0; i < 64; i++)
{
g_free(mod->brush_cache[i].data);
}
LLOGLN(10, ("lxrdp_end:")); LLOGLN(10, ("lxrdp_end:"));
return 0; return 0;
} }
@ -973,7 +981,8 @@ lfreerdp_pre_connect(freerdp* instance)
while (error == 0) while (error == 0)
{ {
num_chans++; num_chans++;
g_writeln(" got channel [%s], flags [0x%8.8x]", ch_name, ch_flags); LLOGLN(10, ("lfreerdp_pre_connect: got channel [%s], flags [0x%8.8x]",
ch_name, ch_flags));
g_strncpy(instance->settings->channels[index].name, ch_name, 8); g_strncpy(instance->settings->channels[index].name, ch_name, 8);
instance->settings->channels[index].options = ch_flags; instance->settings->channels[index].options = ch_flags;
index++; index++;
@ -981,8 +990,6 @@ lfreerdp_pre_connect(freerdp* instance)
} }
instance->settings->num_channels = num_chans; instance->settings->num_channels = num_chans;
//g_hexdump(instance->settings->order_support, 32);
instance->settings->offscreen_bitmap_cache = false; instance->settings->offscreen_bitmap_cache = false;
instance->settings->glyph_cache = true; instance->settings->glyph_cache = true;
@ -1094,17 +1101,13 @@ lfreerdp_receive_channel_data(freerdp* instance, int channelId, uint8* data,
total_size, flags); total_size, flags);
if (error != 0) if (error != 0)
{ {
g_writeln("lfreerdp_receive_channel_data: error %d", error); LLOGLN(0, ("lfreerdp_receive_channel_data: error %d", error));
} }
} }
else else
{ {
g_writeln("lfreerdp_receive_channel_data: bad lchid"); LLOGLN(0, ("lfreerdp_receive_channel_data: bad lchid"));
} }
//g_writeln("lfreerdp_receive_channel_data: bytes %d id %d flags %d lchid %d",
// size, channelId, flags, lchid);
return 0; return 0;
} }