[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta783-27-g3b20cc2

[by Werner Koch]

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  3b20cc21de86ac8a475bdefd3aebb02a12fb8d0b (commit)
      from  64329cce9a0f21cf941ff2c3f542a08c57cb5378 (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 3b20cc21de86ac8a475bdefd3aebb02a12fb8d0b
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Sep 10 09:15:57 2014 +0200

    dirmngr: Fix the ks_fetch command for the http scheme.
    
    * common/http.c (http_session_ref): Allow for NULL arg.
    --
    
    We always test for a an existing session and thus passing NULL as
    session object should be allowed.
    
    Reported-by: Jens Lechtenboerger

diff --git a/common/http.c b/common/http.c
index fe83e3f..7e3bb57 100644
--- a/common/http.c
+++ b/common/http.c
@@ -636,12 +636,17 @@ http_session_new (http_session_t *r_session, const char *tls_priority)
 }
 
 
-/* Increment the reference count for session SESS.  */
+/* Increment the reference count for session SESS.  Passing NULL for
+   SESS is allowed. */
 http_session_t
 http_session_ref (http_session_t sess)
 {
-  sess->refcount++;
-  /* log_debug ("http.c:session_ref: sess %p ref now %d\n", sess, sess->refcount); */
+  if (sess)
+    {
+      sess->refcount++;
+      /* log_debug ("http.c:session_ref: sess %p ref now %d\n", sess, */
+      /*            sess->refcount); */
+    }
   return sess;
 }
 

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

Summary of changes:
 common/http.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)


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