On Mon, Jan 25, 2010 at 04:37:43PM +0100, Jim Meyering wrote: > I know better than to say this is so simple/obvious that > it doesn't need review, but I'm tempted... > > >From 02c7dfa830544bbafd62867fc70b3aba7cc07385 Mon Sep 17 00:00:00 2001 > From: Jim Meyering <meyering@xxxxxxxxxx> > Date: Mon, 25 Jan 2010 16:36:07 +0100 > Subject: [PATCH] usbFindBusByVendor: don't leak a DIR buffer and FD > > * src/util/hostusb.c (usbFindBusByVendor): Don't leak a DIR buffer > and file descriptor. > --- > src/util/hostusb.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/src/util/hostusb.c b/src/util/hostusb.c > index 8fbb486..9a37103 100644 > --- a/src/util/hostusb.c > +++ b/src/util/hostusb.c > @@ -1,5 +1,5 @@ > /* > - * Copyright (C) 2009 Red Hat, Inc. > + * Copyright (C) 2009-2010 Red Hat, Inc. > * > * This library is free software; you can redistribute it and/or > * modify it under the terms of the GNU Lesser General Public > @@ -151,6 +151,7 @@ static int usbFindBusByVendor(virConnectPtr conn, > ret = 0; > > error: > + closedir (dir); > return ret; > } ACK, that context is a little misleading because the original code 'error:' should have been 'cleanup:' really, since it is a shared success/failure path, not a separate error path. Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :| -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list