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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Sat Sep  4 12:19:19 2010
New Revision: 5241

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5241
Log:
HPReadBundleValues(): do not fail if the key "CFBundleName" is not found
in a driver Info.plist. This key should only be defined for the CCID
class driver.

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=5241&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug_libhal.c (original)
+++ trunk/PCSC/src/hotplug_libhal.c Sat Sep  4 12:19:19 2010
@@ -171,8 +171,12 @@
 			GET_KEY(PCSCLITE_HP_NAMEKEY_NAME, &readerNames)
 
 			/* Get CFBundleName */
-			GET_KEY(PCSCLITE_HP_CFBUNDLE_NAME, &values)
-			CFBundleName = list_get_at(values, 0);
+			rv = LTPBundleFindValueWithKey(&plist, PCSCLITE_HP_CFBUNDLE_NAME,
+				&values);
+			if (rv)
+				CFBundleName = NULL;
+			else
+				CFBundleName = strdup(list_get_at(values, 0));
 
 			/* while we find a nth ifdVendorID in Info.plist */
 			for (alias=0; alias<list_size(manuIDs); alias++)
@@ -192,7 +196,7 @@
 				driverTracker[listCount].bundleName = strdup(currFP->d_name);
 				driverTracker[listCount].libraryPath = strdup(fullLibPath);
 				driverTracker[listCount].ifdCapabilities = ifdCapabilities;
-				driverTracker[listCount].CFBundleName = strdup(CFBundleName);
+				driverTracker[listCount].CFBundleName = CFBundleName;
 
 #ifdef DEBUG_HOTPLUG
 				Log2(PCSC_LOG_INFO, "Found driver for: %s",