diff options
| author | Werner Koch <wk@gnupg.org> | 2008-03-25 20:41:11 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2008-03-25 20:41:11 +0100 |
| commit | 9a8ee6e6be362fd43b5b208909121144ffaf770c (patch) | |
| tree | 421fb8afb3e9d3b05b62728ea64cb5b0a9009141 /g10 | |
| parent | Fix bug 894. (diff) | |
| download | gnupg2-9a8ee6e6be362fd43b5b208909121144ffaf770c.tar.xz gnupg2-9a8ee6e6be362fd43b5b208909121144ffaf770c.zip | |
Changed the way i18n files are located under Windows. The setting of the
Registry key is not anymore required. Helpfiles are not properly located.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/keyserver.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index c9ad8f95f..fbb2930f8 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2008-03-25 Werner Koch <wk@g10code.com> + + * keyserver.c (parse_keyrec): Take care of char defaulting to + unsigned when using hextobyte. + 2008-03-25 David Shaw <dshaw@jabberwocky.com> (wk) * import.c (collapse_uids): Fix bug 894: possible memory diff --git a/g10/keyserver.c b/g10/keyserver.c index 23497d819..9a4e08483 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -683,9 +683,9 @@ parse_keyrec(char *keystring) while(*tok) if(tok[0]=='%' && tok[1] && tok[2]) { - if((userid[i]=hextobyte(&tok[1]))==-1) - userid[i]='?'; + int c; + userid[i] = (c=hextobyte(&tok[1])) == -1 ? '?' : c; i++; tok+=3; } |