[ovs-dev] [PATCH] ovsdb-idlc: Fix memory leak in "optional bool" columns.

Ben Pfaff blp at nicira.com
Fri Mar 23 17:19:57 UTC 2012


Thanks, I pushed this to master and branch-1.6.

On Thu, Mar 22, 2012 at 05:30:59PM -0700, Ethan Jackson wrote:
> Looks good to me.
> 
> Ethan
> 
> On Thu, Mar 22, 2012 at 13:24, Ben Pfaff <blp at nicira.com> wrote:
> > Commit 1bf2c9096858 (idl: Generalize special case boolean exception.)
> > changed the IDL to do dynamic allocation with (x)malloc() for optional
> > booleans, but it didn't add the corresponding calls to free().  This
> > commit fixes the problem.
> >
> > Bug #10357.
> > Reported-by: Paul Ingram <paul at nicira.com>
> > Reported-by: Krishna Miriyala <krishna at nicira.com>
> > Signed-off-by: Ben Pfaff <blp at nicira.com>
> > ---
> >  ovsdb/ovsdb-idlc.in |   10 +---------
> >  1 files changed, 1 insertions(+), 9 deletions(-)
> >
> > diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
> > index 089bc23..4fd741f 100755
> > --- a/ovsdb/ovsdb-idlc.in
> > +++ b/ovsdb/ovsdb-idlc.in
> > @@ -305,15 +305,7 @@ static void
> >         # Unparse functions.
> >         for columnName, column in sorted(table.columns.iteritems()):
> >             type = column.type
> > -            if (type.key.type == ovs.db.types.BooleanType and not type.value
> > -                and type.n_min == 0 and type.n_max == 1):
> > -                print '''
> > -static void
> > -%(s)s_unparse_%(c)s(struct ovsdb_idl_row *row OVS_UNUSED)
> > -{
> > -    /* Nothing to do. */
> > -}''' % {'s': structName, 'c': columnName}
> > -            elif (type.n_min != 1 or type.n_max != 1) and not type.is_optional_pointer():
> > +            if (type.n_min != 1 or type.n_max != 1) and not type.is_optional_pointer():
> >                 print '''
> >  static void
> >  %(s)s_unparse_%(c)s(struct ovsdb_idl_row *row_)
> > --
> > 1.7.2.5
> >
> > _______________________________________________
> > dev mailing list
> > dev at openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev



More information about the dev mailing list