51 lines
1.5 KiB
Diff
51 lines
1.5 KiB
Diff
|
diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c
|
||
|
|
index 836d713..c36628e 100644
|
||
|
|
--- a/modules/pam_pwhistory/opasswd.c
|
||
|
|
+++ b/modules/pam_pwhistory/opasswd.c
|
||
|
|
@@ -82,10 +82,15 @@ parse_entry (char *line, opwd *data)
|
||
|
|
{
|
||
|
|
const char delimiters[] = ":";
|
||
|
|
char *endptr;
|
||
|
|
+ char *count;
|
||
|
|
|
||
|
|
data->user = strsep (&line, delimiters);
|
||
|
|
data->uid = strsep (&line, delimiters);
|
||
|
|
- data->count = strtol (strsep (&line, delimiters), &endptr, 10);
|
||
|
|
+ count = strsep (&line, delimiters);
|
||
|
|
+ if (data->user == NULL || data->uid == NULL || count == NULL)
|
||
|
|
+ return 1;
|
||
|
|
+
|
||
|
|
+ data->count = strtol (count, &endptr, 10);
|
||
|
|
if (endptr != NULL && *endptr != '\0')
|
||
|
|
return 1;
|
||
|
|
|
||
|
|
diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c
|
||
|
|
index 4840bb2..7f7bc49 100644
|
||
|
|
--- a/modules/pam_unix/passverify.c
|
||
|
|
+++ b/modules/pam_unix/passverify.c
|
||
|
|
@@ -639,11 +639,23 @@ save_old_password(pam_handle_t *pamh, const char *forwho, const char *oldpass,
|
||
|
|
continue;
|
||
|
|
buf[strlen(buf) - 1] = '\0';
|
||
|
|
s_luser = strtok_r(buf, ":", &sptr);
|
||
|
|
+ if (s_luser == NULL) {
|
||
|
|
+ found = 0;
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
s_uid = strtok_r(NULL, ":", &sptr);
|
||
|
|
+ if (s_uid == NULL) {
|
||
|
|
+ found = 0;
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
s_npas = strtok_r(NULL, ":", &sptr);
|
||
|
|
+ if (s_npas == NULL) {
|
||
|
|
+ found = 0;
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
s_pas = strtok_r(NULL, ":", &sptr);
|
||
|
|
npas = strtol(s_npas, NULL, 10) + 1;
|
||
|
|
- while (npas > howmany) {
|
||
|
|
+ while (npas > howmany && s_pas != NULL) {
|
||
|
|
s_pas = strpbrk(s_pas, ",");
|
||
|
|
if (s_pas != NULL)
|
||
|
|
s_pas++;
|