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

Remove unnecessary g_malloc() call

Browse Source
This commit is contained in:
matt335672 2020-04-24 11:27:36 +01:00
parent 7ef01f7b0c
commit 617283eb34
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sesman/chansrv/chansrv.c
View File

@ -1045,9 +1045,13 @@ my_api_trans_data_in(struct trans *trans)
int rv; int rv;
int bytes; int bytes;
int ver; int ver;
unsigned int channel_name_bytes;
struct chansrv_drdynvc_procs procs; struct chansrv_drdynvc_procs procs;
char *chan_name; /*
* Name is limited to CHANNEL_NAME_BYTES for an SVC, or MAX_PATH
* bytes for a DVC
*/
char chan_name[MAX(CHANNEL_NAME_BYTES, MAX_PATH) + 1];
unsigned int channel_name_bytes;
//g_writeln("my_api_trans_data_in: extra_flags %d", trans->extra_flags); //g_writeln("my_api_trans_data_in: extra_flags %d", trans->extra_flags);
rv = 0; rv = 0;
@ -1070,19 +1074,13 @@ my_api_trans_data_in(struct trans *trans)
rv = 1; rv = 1;
in_uint32_le(s, channel_name_bytes); in_uint32_le(s, channel_name_bytes);
//g_writeln("my_api_trans_data_in: channel_name_bytes %d", channel_name_bytes); //g_writeln("my_api_trans_data_in: channel_name_bytes %d", channel_name_bytes);
/* if (channel_name_bytes > (sizeof(chan_name) - 1))
* Name is limited to CHANNEL_NAME_BYTES for an SVC, or MAX_PATH
* bytes for a DVC */
if (channel_name_bytes > MAX(CHANNEL_NAME_BYTES, MAX_PATH))
{
return 1;
}
chan_name = g_new0(char, channel_name_bytes + 1);
if (chan_name == NULL)
{ {
return 1; return 1;
} }
in_uint8a(s, chan_name, channel_name_bytes); in_uint8a(s, chan_name, channel_name_bytes);
chan_name[channel_name_bytes] = '\0';
in_uint32_le(s, ad->chan_flags); in_uint32_le(s, ad->chan_flags);
//g_writeln("my_api_trans_data_in: chan_name %s chan_flags 0x%8.8x", chan_name, ad->chan_flags); //g_writeln("my_api_trans_data_in: chan_name %s chan_flags 0x%8.8x", chan_name, ad->chan_flags);
if (ad->chan_flags == 0) if (ad->chan_flags == 0)
@ -1142,7 +1140,6 @@ my_api_trans_data_in(struct trans *trans)
// "chan_id %d", rv, ad->chan_id); // "chan_id %d", rv, ad->chan_id);
g_drdynvcs[ad->chan_id].xrdp_api_trans = trans; g_drdynvcs[ad->chan_id].xrdp_api_trans = trans;
} }
g_free(chan_name);
init_stream(s, 0); init_stream(s, 0);
trans->extra_flags = 2; trans->extra_flags = 2;
trans->header_size = 0; trans->header_size = 0;