[Pcsclite-cvs-commit] r3265 - /trunk/PCSC/src/hotplug_libhal.c

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Mon Jan 5 10:43:28 UTC 2009


Author: rousseau
Date: Mon Jan  5 10:43:28 2009
New Revision: 3265

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3265
Log:
avoid a memory leak in case of DBus error

Modified:
    trunk/PCSC/src/hotplug_libhal.c

Modified: trunk/PCSC/src/hotplug_libhal.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug_libhal.c?rev=3265&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libhal.c (original)
+++ trunk/PCSC/src/hotplug_libhal.c Mon Jan  5 10:43:28 2009
@@ -277,10 +277,10 @@
 	int i;
 	unsigned int idVendor, idProduct;
 
-	dbus_error_init(&error);
-
 	if (!libhal_device_property_exists(ctx, udi, "usb.vendor_id", NULL))
 		return NULL;
+
+	dbus_error_init(&error);
 
 	/* Vendor ID */
 	idVendor = libhal_device_get_property_int(ctx, udi,
@@ -329,8 +329,6 @@
 	struct _driverTracker *driver;
 	LONG ret;
 
-	dbus_error_init (&error);
-
 	driver = get_driver(ctx, udi);
 	if (NULL == driver)
 	{
@@ -370,6 +368,8 @@
 	readerTracker[i].udi = strdup(udi);
 
 #ifdef ADD_SERIAL_NUMBER
+	dbus_error_init (&error);
+
 	if (libhal_device_property_exists(ctx, udi, "usb.serial", &error))
 	{
 		char fullname[MAX_READERNAME];




More information about the Pcsclite-cvs-commit mailing list