security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-10 13:04:23 +01:00
Code Activity

scd: fix parsing login-data DO.

Browse Source 
* scd/app-openpgp.c (parse_login_data): Release RELPTR.  Fix parsing.

--

Signed-off-by: NIIBE Yutaka
This commit is contained in:
NIIBE Yutaka 2013-08-27 10:23:09 +09:00
parent 6d8f36a045
commit 9158f58822
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
scd/app-openpgp.c
View File

@ -629,7 +629,11 @@ parse_login_data (app_t app)
if (*buffer == '\n') if (*buffer == '\n')
break; break;
if (buflen < 2 || buffer[1] != '\x14') if (buflen < 2 || buffer[1] != '\x14')
return; /* No control sequences. */ {
xfree (relptr);
return; /* No control sequences. */
}
buflen--; buflen--;
buffer++; buffer++;
do do
@ -676,14 +680,11 @@ parse_login_data (app_t app)
m = strtol (q, &q, 10); m = strtol (q, &q, 10);
} }
buffer = q;
if (buflen < ((unsigned char *)q - buffer)) if (buflen < ((unsigned char *)q - buffer))
{ break;
buflen = 0;
break; buflen -= ((unsigned char *)q - buffer);
} buffer = q;
else
buflen -= ((unsigned char *)q - buffer);
if (buflen && !(*buffer == '\n' || *buffer == '\x18')) if (buflen && !(*buffer == '\n' || *buffer == '\x18'))
goto next; goto next;
@ -694,11 +695,11 @@ parse_login_data (app_t app)
} }
} }
next: next:
for (; buflen && *buffer != '\x18'; buflen--, buffer++) /* Skip to FS (0x18) or LF (\n). */
if (*buffer == '\n') for (; buflen && *buffer != '\x18' && *buffer != '\n'; buflen--)
buflen = 1; buffer++;
} }
while (buflen); while (buflen && *buffer != '\n');
xfree (relptr); xfree (relptr);
} }