aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2003-10-25 14:22:08 +0000
committerWerner Koch <[email protected]>2003-10-25 14:22:08 +0000
commitf936866734f9d8bd16a41d43bd7cc4edad6fe728 (patch)
tree7fa586de6b7c02f6e9d0ffa7eeaf9e793789a7a4
parent* command.c (cmd_checkpin): New. (diff)
downloadgnupg-f936866734f9d8bd16a41d43bd7cc4edad6fe728.tar.gz
gnupg-f936866734f9d8bd16a41d43bd7cc4edad6fe728.zip
(learn_status_cb, scd_genkey_cb): Fixed faulty use
of !spacep().
-rw-r--r--g10/ChangeLog5
-rw-r--r--g10/call-agent.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 80216ced3..c6dfa1db7 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-25 Werner Koch <[email protected]>
+
+ * call-agent.c (learn_status_cb, scd_genkey_cb): Fixed faulty use
+ of !spacep().
+
2003-10-20 Werner Koch <[email protected]>
* card-util.c (card_edit): New command "passwd". Add logic to
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 9ca127c3c..b981b7f22 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -520,14 +520,14 @@ learn_status_cb (void *opaque, const char *line)
while (spacep (p))
p++;
parm->chv1_cached = atoi (p);
- while (!spacep (p))
+ while (*p && !spacep (p))
p++;
while (spacep (p))
p++;
for (i=0; *p && i < 3; i++)
{
parm->chvmaxlen[i] = atoi (p);
- while (!spacep (p))
+ while (*p && !spacep (p))
p++;
while (spacep (p))
p++;
@@ -535,7 +535,7 @@ learn_status_cb (void *opaque, const char *line)
for (i=0; *p && i < 3; i++)
{
parm->chvretry[i] = atoi (p);
- while (!spacep (p))
+ while (*p && !spacep (p))
p++;
while (spacep (p))
p++;
@@ -546,7 +546,7 @@ learn_status_cb (void *opaque, const char *line)
else if (keywordlen == 7 && !memcmp (keyword, "KEY-FPR", keywordlen))
{
int no = atoi (line);
- while (!spacep (line))
+ while (*line && !spacep (line))
line++;
while (spacep (line))
line++;
@@ -674,7 +674,7 @@ scd_genkey_cb (void *opaque, const char *line)
gcry_mpi_t a;
const char *name = line;
- while (!spacep (line))
+ while (*line && !spacep (line))
line++;
while (spacep (line))
line++;