Skip to content

fix(oval): use %d in CIM datetime sscanf for int fields #2352

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

Open
Mab879 wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −2
Open

fix(oval): use %d in CIM datetime sscanf for int fields #2352

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/OVAL/oval_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1999,12 +1999,12 @@ static bool _match(const char *pattern, const char *string)
static long unsigned int _parse_fmt_cim(char *dt)
{
const char *pattern1 = "^[0-9]{14}\\.[0-9]{6}[+-][0-9]{3}$"; // yyyymmddHHMMSS.mmmmmmsUUU
const char *fmt_str1 = "%4u%2u%2u%2u%2u%2u.%*6u%*[+-]%*3u";
const char *fmt_str1 = "%4d%2d%2d%2d%2d%2d.%*6d%*[+-]%*3d";
const char *pattern2 = "^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}:[0-9]{3}$"; // yyyy-mm-dd HH:MM:SS:mmm
const char *fmt_str2 = "%4d-%2d-%2d %2d:%2d:%2d:%*3d";
const char *pattern3 = "^[0-9]{2}-[0-9]{2}-[0-9]{4} [0-9]{2}:[0-9]{2}:[0-9]{2}:[0-9]{3}$"; // mm-dd-yyyy hh:mm:ss:mmm
const char *fmt_str3 = "%2d-%2d-%4d %2d:%2d:%2d:%*3d";
int year, month, day, hour, minute, second, r = 0;
int year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0, r = 0;
const int number_of_items = 6;
if (_match(pattern1, dt)) {
r = sscanf(dt, fmt_str1, &year, &month, &day, &hour, &minute, &second);
Expand Down
Loading