Skip to content

Low: libcrmcommon: Ignore empty time spec #4075

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

Merged
clumens merged 2 commits into from
Mar 30, 2026
+15 −17
Merged

Low: libcrmcommon: Ignore empty time spec #4075

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32121e0
Refactor: libcrmcommon: Drop NULL check in parse_time()
nrwahl2 Mar 28, 2026
b3311ce
Low: libcrmcommon: Ignore empty time spec
nrwahl2 Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions lib/common/iso8601.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ parse_hms(const char *time_str, int *result)
rc = sscanf(time_str, "%2" SCNu32 "%2" SCNu32 "%2" SCNu32,
&hour, &minute, &second);
}
if (rc == 0) {
pcmk__err("%s is not a valid ISO 8601 time specification", time_str);
if (rc < 1) {
pcmk__err("'%s' is not a valid ISO 8601 time specification", time_str);
return false;
}

Expand Down Expand Up @@ -334,24 +334,22 @@ parse_time(const char *time_str, crm_time_t *a_time)

tzset();

if (time_str != NULL) {
if (!parse_hms(time_str, &(a_time->seconds))) {
return false;
}
if (!parse_hms(time_str, &(a_time->seconds))) {
return false;
}

offset_s = strchr(time_str, 'Z');
offset_s = strchr(time_str, 'Z');

/* @COMPAT: Spaces between the time and the offset are not supported
* by the standard according to section 3.4.1 and 4.2.5.2.
*/
if (offset_s == NULL) {
offset_s = strpbrk(time_str, " +-");
}
/* @COMPAT: Spaces between the time and the offset are not supported by the
* standard according to section 3.4.1 and 4.2.5.2.
*/
if (offset_s == NULL) {
offset_s = strpbrk(time_str, " +-");
}

if (offset_s != NULL) {
while (isspace(*offset_s)) {
offset_s++;
}
if (offset_s != NULL) {
while (isspace(*offset_s)) {
offset_s++;
}
}

Expand Down