[git] GnuPG - branch, master, updated. gnupg-2.1.9-118-g2242658

[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  2242658efe0c975a46c3316bc9171ddbce085e2c (commit)
       via  20125333e7b822e8c70ac8cef986649f0654eb56 (commit)
      from  28e198201e580b39bceb9c151df07fc0e936a91d (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 2242658efe0c975a46c3316bc9171ddbce085e2c
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 6 13:29:01 2015 +0100

    gpg: Avoid new strings.
    
    * g10/decrypt-data.c (decrypt_data): Use already translated strings.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c
index 970d911..2d9f54f 100644
--- a/g10/decrypt-data.c
+++ b/g10/decrypt-data.c
@@ -239,10 +239,10 @@ decrypt_data (ctrl_t ctrl, void *procctx, PKT_encrypted *ed, DEK *dek)
 
           iobuf_copy (output, ed->buf);
           if ((rc = iobuf_error (ed->buf)))
-            log_error (_("error reading: %s: %s\n"),
+            log_error (_("error reading '%s': %s\n"),
                        filename, gpg_strerror (rc));
           else if ((rc = iobuf_error (output)))
-            log_error (_("error writing output ('%s'): %s\n"),
+            log_error (_("error writing '%s': %s\n"),
                        filename, gpg_strerror (rc));
 
           iobuf_close (output);

commit 20125333e7b822e8c70ac8cef986649f0654eb56
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 6 13:20:01 2015 +0100

    common: Fix commit f99830b.
    
    * common/userids.c (classify_user_id): Avoid underflow.  Use spacep to
    also trim tabs.
    --
    
    This is actually not fully consistent because the now used
    trim_trailing_spaces uses the locale dependent isspace and not spacep.
    Given that the use of isspace is anyway problematic we should check
    whether we can chnage trim_trailing_spaces.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/common/userids.c b/common/userids.c
index 25d6741..f9a0036 100644
--- a/common/userids.c
+++ b/common/userids.c
@@ -89,11 +89,15 @@ classify_user_id (const char *name, KEYDB_SEARCH_DESC *desc, int openpgp_hack)
   /* Skip leading and trailing spaces.  */
   for(s = name; *s && spacep (s); s++ )
     ;
-  if (s[strlen(s) - 1] == ' ')
+  if (*s && spacep (s + strlen(s) - 1))
     {
-      s2 = xstrdup (s);
-      while (s2[strlen(s2) - 1] == ' ')
-        s2[strlen(s2) - 1] = 0;
+      s2 = xtrystrdup (s);
+      if (!s2)
+        {
+          rc = gpg_error_from_syserror ();
+          goto out;
+        }
+      trim_trailing_spaces (s2);
       s = s2;
     }
 

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

Summary of changes:
 common/userids.c   | 12 ++++++++----
 g10/decrypt-data.c |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)


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