[git] GnuPG - branch, master, updated. gnupg-2.1.11-93-g7a32f87

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  7a32f87cccddb40521bfdd4eb2d0dc9c88fb3fe5 (commit)
      from  e997552161b2dd8aabf350adee14e208e1545aef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7a32f87cccddb40521bfdd4eb2d0dc9c88fb3fe5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Mar 7 20:12:38 2016 +0900

    scd: Bug fix for a device with multiple interfaces.
    
    * scd/ccid-driver.c (scan_or_find_usb_device): Use IFC_NO when
    accessing interface information.
    
    --
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 87cec32..e968b83 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -1155,9 +1155,10 @@ scan_or_find_usb_device (int scan_mode,
 
       for (ifc_no=0; ifc_no < config->bNumInterfaces; ifc_no++)
         {
-          for (set_no=0; set_no < config->interface->num_altsetting; set_no++)
+          for (set_no=0; set_no < config->interface[ifc_no].num_altsetting;
+               set_no++)
             {
-              ifcdesc = (config->interface->altsetting + set_no);
+              ifcdesc = (config->interface[ifc_no].altsetting + set_no);
               /* The second condition is for older SCM SPR 532 who did
                  not know about the assigned CCID class.  The third
                  condition does the same for a Cherry SmartTerminal

-----------------------------------------------------------------------

Summary of changes:
 scd/ccid-driver.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org