d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep a copy of the original pointer returned by openpam_readline() so

Browse Source 
we can free it later, instead of trying to free a pointer that points
to the end of the buffer.

Committed to head because this code no longer exists upstream.

Submitted by:	jasone@
This commit is contained in:
Dag-Erling Smørgrav 2012-04-12 11:23:24 +00:00
parent 2dd9ea6f70
commit a7216790d8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/openpam/lib/openpam_configure.c
View File

@ -360,7 +360,7 @@ openpam_parse_chain(pam_handle_t *pamh,
pam_chain_t *this, **next;
pam_facility_t fclt;
pam_control_t ctlf;
char *line, *str, *name;
char *line0, *line, *str, *name;
char *option, **optv;
int len, lineno, ret;
FILE *f;
@ -377,18 +377,18 @@ openpam_parse_chain(pam_handle_t *pamh,
this = NULL;
name = NULL;
lineno = 0;
while ((line = openpam_readline(f, &lineno, NULL)) != NULL) {
while ((line0 = line = openpam_readline(f, &lineno, NULL)) != NULL) {
/* get service name if necessary */
if (style == pam_conf_style) {
if ((len = parse_service_name(&line, &str)) == 0) {
openpam_log(PAM_LOG_NOTICE,
"%s(%d): invalid service name (ignored)",
filename, lineno);
FREE(line);
FREE(line0);
continue;
}
if (strlcmp(service, str, len) != 0) {
FREE(line);
FREE(line0);
continue;
}
}
@ -401,7 +401,7 @@ openpam_parse_chain(pam_handle_t *pamh,
goto fail;
}
if (facility != fclt && facility != PAM_FACILITY_ANY) {
FREE(line);
FREE(line0);
continue;
}
@ -425,7 +425,7 @@ openpam_parse_chain(pam_handle_t *pamh,
FREE(name);
if (ret != PAM_SUCCESS)
goto fail;
FREE(line);
FREE(line0);
continue;
}
@ -486,7 +486,7 @@ openpam_parse_chain(pam_handle_t *pamh,
this = NULL;
/* next please... */
FREE(line);
FREE(line0);
}
if (!feof(f))
goto syserr;