[git] GnuPG - branch, master, updated. gnupg-2.1.1-45-g274d7b1

[by Joshua Rogers]

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  274d7b17a90908a90ba6ad295c08a79b287fc231 (commit)
      from  3f6abb57a7b5e54b593c5775c8f7a07d61119705 (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 274d7b17a90908a90ba6ad295c08a79b287fc231
Author: Joshua Rogers <git at internot.info>
Date:   Sat Jan 24 03:03:33 2015 +1100

    ccid: Remove incorrect expression leading to errors.
    
    * scd/ccid-driver.c (send_escape_cmd): Fix setting of 'rc'.
    --
    
    Variable 'rc' in send_escape_cmd was overwritten before it was
    returned, leading to incorrect computation.
    
    Signed-off-by: Joshua Rogers <git at internot.info>
    
    [Log entry reformatted - wk]
    
    (cherry picked from commit 3d9f8bf1dc0c7165a5d2a31568ed425d2dc3b91e)

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 7a91e09..fdfe1f5 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -2230,8 +2230,8 @@ send_escape_cmd (ccid_driver_t handle,
             {
               memcpy (result, msg, msglen);
               *resultlen = msglen;
+              rc = 0;
             }
-          rc = 0;
         }
         break;
       default:

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

Summary of changes:
 scd/ccid-driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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