Fix last change.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index e9d8675e83795ef17b7d3a033835a1339d5ee3c3..f848d18130f9d096815491c64f58e05a086dcadc 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-24  Werner Koch  <wk@g10code.com>
+
+       * rungpg.c (gpg_keylist_preprocess): Escape backslashes too.
+
 2008-10-23  Marcus Brinkmann  <marcus@g10code.de>
 
        * rungpg.c (gpg_keylist_preprocess): Convert percent escaped

diff --git a/trunk/gpgme/rungpg.c b/trunk/gpgme/rungpg.c
index 7524d68ffff07a80a7f9b4cbb302f7c7965d9e81..fc0da117786745799cc605f6a1a9c5066fdf300b 100644 (file)
--- a/trunk/gpgme/rungpg.c
+++ b/trunk/gpgme/rungpg.c
@@ -1884,9 +1884,8 @@ gpg_keylist_preprocess (char *line, char **r_line)
       {
        /* The user ID is percent escaped, but we want c-coded.
           Because we have to replace each '%HL' by '\xHL', we need at
-          most 4/3 th the number of bytes.  But because this 
-          security software, we err on the good side and allocate
-          twice as much.  */
+          most 4/3 th the number of bytes.  But because we also need
+          to escape the backslashes we allocate twice as much.  */
        char *uid = malloc (2 * strlen (field[1]) + 1);
        char *src;
        char *dst;
@@ -1902,14 +1901,17 @@ gpg_keylist_preprocess (char *line, char **r_line)
                *(dst++) = '\\';
                *(dst++) = 'x';
                src++;
-               /* Copy the next two bytes unconditionally.  This is
-                  what reduces the maximum number of needed bytes
-                  from 2n+1 to (4/3)n+1, even for invalid strings.  */
+               /* Copy the next two bytes unconditionally.  */
                if (*src)
                  *(dst++) = *(src++);
                if (*src)
                  *(dst++) = *(src++);
              }
+           else if (*src == '\\')
+              {
+                *dst++ = '\\';
+                *dst++ = '\\';
+              }
            else
              *(dst++) = *(src++);
          }