ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

widl: Fix the conditions under which array freeing code is output. 

It doesn't matter whether or not the array is declared as a pointer or 
is declared using array subscripts - the array is still allocated by the 
unmarshalling function and so needs to be freed.

Fix a typo that caused varying arrays never to be freed.

Fix another typo with the check for conformant arrays being performed 
twice, redundantly.
This commit is contained in:
Rob Shearman 2008-01-07 10:17:32 +00:00 committed by Alexandre Julliard
parent 327534f6ef
commit e998892a23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/widl/typegen.c
View File

@ -2819,14 +2819,13 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func,
if (pointer_type != RPC_FC_RP) array_type = "Pointer"; if (pointer_type != RPC_FC_RP) array_type = "Pointer";
print_phase_function(file, indent, array_type, phase, var, start_offset); print_phase_function(file, indent, array_type, phase, var, start_offset);
if (phase == PHASE_FREE && type->declarray && pointer_type == RPC_FC_RP) if (phase == PHASE_FREE && pointer_type == RPC_FC_RP)
{ {
/* these are all unmarshalled by pointing into the buffer on the /* these are all unmarshalled by allocating memory */
* server side */
if (type->type == RPC_FC_BOGUS_ARRAY || if (type->type == RPC_FC_BOGUS_ARRAY ||
type->type == RPC_FC_CVARRAY || type->type == RPC_FC_CVARRAY ||
(type->type == RPC_FC_SMVARRAY && type->type == RPC_FC_LGVARRAY && in_attr) || ((type->type == RPC_FC_SMVARRAY || type->type == RPC_FC_LGVARRAY) && in_attr) ||
(type->type == RPC_FC_CARRAY && type->type == RPC_FC_CARRAY && !in_attr)) (type->type == RPC_FC_CARRAY && !in_attr))
{ {
print_file(file, indent, "if (%s)\n", var->name); print_file(file, indent, "if (%s)\n", var->name);
indent++; indent++;