aboutsummaryrefslogtreecommitdiffstats
path: root/keyserver/gpgkeys_hkp.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyserver/gpgkeys_hkp.c')
-rw-r--r--keyserver/gpgkeys_hkp.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index 25c47d256..698425ada 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -653,6 +653,12 @@ search_key(char *searchkey)
skey++;
}
+ if(!search)
+ {
+ fprintf(console,"gpgkeys: corrupt input?\n");
+ return -1;
+ }
+
search[len]='\0';
fprintf(console,("gpgkeys: searching for \"%s\" from HKP server %s\n"),
@@ -939,7 +945,7 @@ main(int argc,char *argv[])
break;
else
{
- if(line[0]=='\n')
+ if(line[0]=='\n' || line[0]=='\0')
break;
work=malloc(sizeof(struct keylist));
@@ -1069,7 +1075,8 @@ main(int argc,char *argv[])
}
/* Nail that last space */
- searchkey[strlen(searchkey)-1]='\0';
+ if(*searchkey)
+ searchkey[strlen(searchkey)-1]='\0';
if(search_key(searchkey)!=KEYSERVER_OK)
failed++;