[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-20-g4402dc3

by Jim Meyering cvs at cvs.gnupg.org
Mon Jan 16 12:47:07 CET 2012


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  4402dc3f0a5c5d0f26ed2ae97f9cda9cf4e695fa (commit)
       via  37801918cb916ae8c641e003f204dcc70cccb29c (commit)
      from  75a402fc25e4ec9659723dd58306aff3415736f4 (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 4402dc3f0a5c5d0f26ed2ae97f9cda9cf4e695fa
Author: Jim Meyering <meyering at redhat.com>
Date:   Sat Jan 14 22:34:58 2012 +0100

    yat2m: don't dereference pointer to freed memory
    
    * doc/yat2m.c (top_parse_file): Correct macrolist-freeing loop.

diff --git a/doc/yat2m.c b/doc/yat2m.c
index aaa7ea6..a22176c 100644
--- a/doc/yat2m.c
+++ b/doc/yat2m.c
@@ -1203,10 +1203,10 @@ top_parse_file (const char *fname, FILE *fp)
                                  if not in a section.  */
   while (macrolist)
     {
-      macro_t m = macrolist->next;
-      free (m->value);
-      free (m);
-      macrolist = m;
+      macro_t next = macrolist->next;
+      free (macrolist->value);
+      free (macrolist);
+      macrolist = next;
     }
 
   parse_file (fname, fp, &section_name, 0);

commit 37801918cb916ae8c641e003f204dcc70cccb29c
Author: Jim Meyering <meyering at redhat.com>
Date:   Sat Jan 14 22:20:39 2012 +0100

    gpg-agent: fix lc-messages handling not to change Xauthority setting
    
    * agent/gpg-agent.c (main): Supply omitted "break" statement for
    lc-messages option.  Otherwise, control would fall through to the
    following oXauthority case and use the same value there.

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 63f4ba2..c264ba3 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -817,6 +817,7 @@ main (int argc, char **argv )
         case oTTYtype: default_ttytype = xstrdup (pargs.r.ret_str); break;
         case oLCctype: default_lc_ctype = xstrdup (pargs.r.ret_str); break;
         case oLCmessages: default_lc_messages = xstrdup (pargs.r.ret_str);
+          break;
         case oXauthority: default_xauthority = xstrdup (pargs.r.ret_str);
           break;
 

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

Summary of changes:
 agent/gpg-agent.c |    1 +
 doc/yat2m.c       |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)


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




More information about the Gnupg-commits mailing list