From owner-p4-projects@FreeBSD.ORG  Sun Nov  8 10:55:39 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AA1741065670; Sun,  8 Nov 2009 10:55:38 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6F2B2106566B
	for <perforce@FreeBSD.org>; Sun,  8 Nov 2009 10:55:38 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5CA3A8FC08
	for <perforce@FreeBSD.org>; Sun,  8 Nov 2009 10:55:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA8AtclU074146
	for <perforce@FreeBSD.org>; Sun, 8 Nov 2009 10:55:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA8Atcns074144
	for perforce@freebsd.org; Sun, 8 Nov 2009 10:55:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 8 Nov 2009 10:55:38 GMT
Message-Id: <200911081055.nA8Atcns074144@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 170348 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Nov 2009 10:55:39 -0000

http://p4web.freebsd.org/chv.cgi?CH=170348

Change 170348 by hselasky@hselasky_laptop001 on 2009/11/08 10:54:42

	
	LibUSB v1.0 - fix a possible device leak.

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb10.c#14 edit

Differences ...

==== //depot/projects/usb/src/lib/libusb/libusb10.c#14 (text+ko) ====

@@ -186,8 +186,6 @@
 	/* create libusb v1.0 compliant devices */
 	i = 0;
 	while ((pdev = libusb20_be_device_foreach(usb_backend, NULL))) {
-		/* get device into libUSB v1.0 list */
-		libusb20_be_dequeue_device(usb_backend, pdev);
 
 		dev = malloc(sizeof(*dev));
 		if (dev == NULL) {
@@ -200,6 +198,10 @@
 			libusb20_be_free(usb_backend);
 			return (LIBUSB_ERROR_NO_MEM);
 		}
+
+		/* get device into libUSB v1.0 list */
+		libusb20_be_dequeue_device(usb_backend, pdev);
+
 		memset(dev, 0, sizeof(*dev));
 
 		/* init transfer queues */