security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

common: Skip the Byte Order Mark in conf files.

Browse Source 
* common/argparse.c (optfile_parse): Detect and skip the UTF-8 BOM.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-12-08 20:25:48 +01:00
parent cb4c7abb77
commit 5c7d582228
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/argparse.c
View File

@ -568,17 +568,35 @@ optfile_parse (FILE *fp, const char *filename, unsigned *lineno,
char *buffer = NULL; char *buffer = NULL;
size_t buflen = 0; size_t buflen = 0;
int in_alias=0; int in_alias=0;
int unread_buf[3]; /* We use an int so that we can store EOF. */
int unread_buf_count = 0;
if (!fp) /* Divert to to arg_parse() in this case. */ if (!fp) /* Divert to to arg_parse() in this case. */
return arg_parse (arg, opts); return arg_parse (arg, opts);
initialize (arg, filename, lineno); initialize (arg, filename, lineno);
/* If the LINENO is zero we assume that we are at the start of a
* file and we skip over a possible Byte Order Mark. */
if (!*lineno)
{
unread_buf[0] = getc (fp);
unread_buf[1] = getc (fp);
unread_buf[2] = getc (fp);
if (unread_buf[0] != 0xef
|| unread_buf[1] != 0xbb
|| unread_buf[2] != 0xbf)
unread_buf_count = 3;
}
/* Find the next keyword. */ /* Find the next keyword. */
state = i = 0; state = i = 0;
for (;;) for (;;)
{ {
c = getc (fp); if (unread_buf_count)
c = unread_buf[3 - unread_buf_count--];
else
c = getc (fp);
if (c == '\n' || c== EOF ) if (c == '\n' || c== EOF )
{ {
if ( c != EOF ) if ( c != EOF )