diff options
author | des <des@FreeBSD.org> | 2013-03-04 18:46:55 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2013-03-04 18:46:55 +0000 |
commit | fc7edbae41d74ca6cbe14c4dfe9b83d8873ae71d (patch) | |
tree | e0624ce39900610dd6d5ac21bbf5fc06703c33d1 /lib | |
parent | d75b7694bd28b26b8efe31df17b3ffc658887896 (diff) | |
download | FreeBSD-src-fc7edbae41d74ca6cbe14c4dfe9b83d8873ae71d.zip FreeBSD-src-fc7edbae41d74ca6cbe14c4dfe9b83d8873ae71d.tar.gz |
Merge upstream r634:646: correctly parse mixed quoted / unquoted text.
See http://www.openpam.org/wiki/Errata#Configurationparsing for details.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/openpam_readline.c | 6 | ||||
-rw-r--r-- | lib/openpam_readword.c | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/lib/openpam_readline.c b/lib/openpam_readline.c index 014acfb..047ab8369 100644 --- a/lib/openpam_readline.c +++ b/lib/openpam_readline.c @@ -62,11 +62,9 @@ openpam_readline(FILE *f, int *lineno, size_t *lenp) size_t len, size; int ch; - if ((line = malloc(size = MIN_LINE_LENGTH)) == NULL) { - openpam_log(PAM_LOG_ERROR, "malloc(): %m"); + line = NULL; + if (openpam_straddch(&line, &size, &len, 0) != 0) return (NULL); - } - len = 0; for (;;) { ch = fgetc(f); /* strip comment */ diff --git a/lib/openpam_readword.c b/lib/openpam_readword.c index 74a4d46..1c0e9b6 100644 --- a/lib/openpam_readword.c +++ b/lib/openpam_readword.c @@ -86,13 +86,8 @@ openpam_readword(FILE *f, int *lineno, size_t *lenp) /* begin quote */ quote = ch; /* edge case: empty quoted string */ - if (word == NULL && (word = malloc(1)) == NULL) { - openpam_log(PAM_LOG_ERROR, "malloc(): %m"); - errno = ENOMEM; + if (openpam_straddch(&word, &size, &len, 0) != 0) return (NULL); - } - *word = '\0'; - size = 1; } else if (ch == quote && !escape) { /* end quote */ quote = 0; |