From 26f00196b359d1dccc42e486652bbc82589f5565 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Wed, 12 Jun 2002 20:53:00 +0000 Subject: * keyserver.c (keyserver_spawn): Properly handle PROGRAM responses when they have a CRLF ending. Noted by Keith Ray. --- g10/ChangeLog | 3 +++ g10/keyserver.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index 890b01900..9d6a27305 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,8 @@ 2002-06-12 David Shaw + * keyserver.c (keyserver_spawn): Properly handle PROGRAM responses + when they have a CRLF ending. Noted by Keith Ray. + * keyserver.c (keyserver_spawn): Handle CRLF endings from keyserver helpers. Also don't leak the last line worth of memory from the keyserver response. diff --git a/g10/keyserver.c b/g10/keyserver.c index 833ec05c1..9338bfbb7 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -523,8 +523,7 @@ keyserver_spawn(int action,STRLIST list, } else if(ascii_memcasecmp(ptr,"PROGRAM ",8)==0) { - ptr[strlen(ptr)-1]='\0'; - if(ascii_strcasecmp(&ptr[8],VERSION)!=0) + if(ascii_memcasecmp(&ptr[8],VERSION,strlen(VERSION))!=0) log_info(_("Warning: keyserver handler from a different " "version of GnuPG (%s)\n"),&ptr[8]); } -- cgit v1.2.3