1 files changed, 2 insertions, 2 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 227af1afb..adeee5935 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -679,9 +679,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;
 	  }