Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

* suggested patch for issue 13944 #14016

Closed
wants to merge 1 commit into from
Closed

* suggested patch for issue 13944 #14016

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 12 additions & 4 deletions apps/ca.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2252,14 +2252,22 @@ static int do_updatedb(CA_DB *db)

if (rrow[DB_type][0] == DB_TYPE_VAL) {
/* ignore entries that are not valid */
if (strncmp(rrow[DB_exp_date], "49", 2) <= 0)
db_y2k = 1;
if (strlen(rrow[DB_exp_date]) == 15)
db_y2k = 1; /* exp. date is 2050-01-01 and later */
else if (strncmp(rrow[DB_exp_date], "49", 2) <= 0)
db_y2k = 1; /* exp. date is between 2000-01-01 and 2049-12-31 */
else
db_y2k = 0;
db_y2k = 0; /* exp. date is between 1950-01-01 and 1999-12-31 */

if (db_y2k == a_y2k) {
char *row_exp_date;
row_exp_date = app_malloc(strlen(rrow[DB_exp_date]) + 1, "exp. date");
if (strlen(rrow[DB_exp_date]) == 15)
memcpy(row_exp_date, rrow[DB_exp_date] + 2, 13);
else
memcpy(row_exp_date, rrow[DB_exp_date], strlen(rrow[DB_exp_date]));
/* all on the same y2k side */
if (strcmp(rrow[DB_exp_date], a_tm_s) <= 0) {
if (strcmp(row_exp_date, a_tm_s) <= 0) {
rrow[DB_type][0] = DB_TYPE_EXP;
rrow[DB_type][1] = '\0';
cnt++;
Expand Down