diff options
| -rw-r--r-- | scd/app-openpgp.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index 4af4e9336..9186e18d4 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -629,7 +629,11 @@ parse_login_data (app_t app) if (*buffer == '\n') break; if (buflen < 2 || buffer[1] != '\x14') - return; /* No control sequences. */ + { + xfree (relptr); + return; /* No control sequences. */ + } + buflen--; buffer++; do @@ -676,14 +680,11 @@ parse_login_data (app_t app) m = strtol (q, &q, 10); } - buffer = q; if (buflen < ((unsigned char *)q - buffer)) - { - buflen = 0; - break; - } - else - buflen -= ((unsigned char *)q - buffer); + break; + + buflen -= ((unsigned char *)q - buffer); + buffer = q; if (buflen && !(*buffer == '\n' || *buffer == '\x18')) goto next; @@ -694,11 +695,11 @@ parse_login_data (app_t app) } } next: - for (; buflen && *buffer != '\x18'; buflen--, buffer++) - if (*buffer == '\n') - buflen = 1; + /* Skip to FS (0x18) or LF (\n). */ + for (; buflen && *buffer != '\x18' && *buffer != '\n'; buflen--) + buffer++; } - while (buflen); + while (buflen && *buffer != '\n'); xfree (relptr); } |