security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

(modify_description): Don't increment OUT_LEN during

Browse Source 
the second pass.
This commit is contained in:
Werner Koch 2005-02-15 16:23:45 +00:00
parent fce56851f0
commit 84282a9538
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/ChangeLog
View File

@ -1,3 +1,8 @@
2005-02-15 Werner Koch <wk@g10code.com>
* findkey.c (modify_description): Don't increment OUT_LEN during
the second pass.
2005-02-14 Moritz Schulte <moritz@g10code.com> 2005-02-14 Moritz Schulte <moritz@g10code.com>
* command-ssh.c (es_read_byte): Renamed to ... * command-ssh.c (es_read_byte): Renamed to ...

11
agent/findkey.c
View File

@ -179,18 +179,20 @@ modify_description (const char *in, const char *comment, char **result)
switch (in[i]) switch (in[i])
{ {
case '%': case '%':
out_len++;
if (out) if (out)
*out++ = '%'; *out++ = '%';
else
out_len++;
break; break;
case 'c': /* Comment. */ case 'c': /* Comment. */
out_len += comment_length; if (out)
if (out && comment_length)
{ {
memcpy (out, comment, comment_length); memcpy (out, comment, comment_length);
out += comment_length; out += comment_length;
} }
else
out_len += comment_length;
break; break;
default: /* Invalid special sequences are ignored. */ default: /* Invalid special sequences are ignored. */
@ -199,9 +201,10 @@ modify_description (const char *in, const char *comment, char **result)
} }
else else
{ {
out_len++;
if (out) if (out)
*out++ = in[i]; *out++ = in[i];
else
out_len++;
} }
} }