GNUPG-1-9-BRANCH gnupg/agent (ChangeLog findkey.c)

[cvs user wk]

    Date: Tuesday, February 15, 2005 @ 17:23:45
  Author: wk
    Path: /cvs/gnupg/gnupg/agent
     Tag: GNUPG-1-9-BRANCH

Modified: ChangeLog findkey.c

(modify_description): Don't increment OUT_LEN during
the second pass.


-----------+
 ChangeLog |    5 +++++
 findkey.c |   11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)


Index: gnupg/agent/ChangeLog
diff -u gnupg/agent/ChangeLog:1.59.2.63 gnupg/agent/ChangeLog:1.59.2.64
--- gnupg/agent/ChangeLog:1.59.2.63	Mon Feb 14 21:44:22 2005
+++ gnupg/agent/ChangeLog	Tue Feb 15 17:23:45 2005
@@ -1,3 +1,8 @@
+2005-02-15  Werner Koch  <wk at g10code.com>
+
+	* findkey.c (modify_description): Don't increment OUT_LEN during
+	the second pass.
+
 2005-02-14  Moritz Schulte  <moritz at g10code.com>
 
 	* command-ssh.c (es_read_byte): Renamed to ...
Index: gnupg/agent/findkey.c
diff -u gnupg/agent/findkey.c:1.17.2.7 gnupg/agent/findkey.c:1.17.2.8
--- gnupg/agent/findkey.c:1.17.2.7	Thu Feb  3 18:40:02 2005
+++ gnupg/agent/findkey.c	Tue Feb 15 17:23:45 2005
@@ -179,18 +179,20 @@
               switch (in[i])
                 {
                 case '%':
-                  out_len++;
                   if (out)
                     *out++ = '%';
+                  else
+                    out_len++;
                   break;
 
                 case 'c': /* Comment.  */
-                  out_len += comment_length;
-                  if (out && comment_length)
+                  if (out)
                     {
                       memcpy (out, comment, comment_length);
                       out += comment_length;
                     }
+                  else
+                    out_len += comment_length;
                   break;
 
                 default: /* Invalid special sequences are ignored.  */
@@ -199,9 +201,10 @@
             }
           else
             {
-              out_len++;
               if (out)
                 *out++ = in[i];
+              else
+                out_len++;
             }
         }