Skip to content

Fix incorrect GLIBC version parsing #236082

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
connor4312 merged 7 commits into from
Dec 16, 2024
Merged

Fix incorrect GLIBC version parsing #236082

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e044a71
Fix incorrect GLIBC version parsing
aslezar Dec 13, 2024
b08e544
Merge branch 'main' into fix-glibc-parse
aslezar Dec 13, 2024
1fc4592
Merge branch 'microsoft:main' into fix-glibc-parse
aslezar Dec 13, 2024
88cb8d5
Merge branch 'microsoft:main' into fix-glibc-parse
aslezar Dec 15, 2024
5c525a4
fixed formatting
aslezar Dec 15, 2024
adb6e19
Merge branch 'microsoft:main' into fix-glibc-parse
aslezar Dec 16, 2024
386d58d
fixed formattting error
aslezar Dec 16, 2024
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
15 changes: 14 additions & 1 deletion cli/src/util/prereqs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use super::errors::CodeError;

lazy_static! {
static ref LDCONFIG_STDC_RE: Regex = Regex::new(r"libstdc\+\+.* => (.+)").unwrap();
static ref LDD_VERSION_RE: BinRegex = BinRegex::new(r"^ldd.*(.+)\.(.+)\s").unwrap();
static ref LDD_VERSION_RE: BinRegex = BinRegex::new(r"^ldd.*\s(\d+)\.(\d+)(?:\.(\d+))?\s").unwrap();
static ref GENERIC_VERSION_RE: Regex = Regex::new(r"^([0-9]+)\.([0-9]+)$").unwrap();
static ref LIBSTD_CXX_VERSION_RE: BinRegex =
BinRegex::new(r"GLIBCXX_([0-9]+)\.([0-9]+)(?:\.([0-9]+))?").unwrap();
Expand Down Expand Up @@ -401,5 +401,18 @@ mod tests {
extract_ldd_version(&actual),
Some(SimpleSemver::new(2, 31, 0)),
);

let actual2 = "ldd (GNU libc) 2.40.9000
Copyright (C) 2024 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Written by Roland McGrath and Ulrich Drepper."
.to_owned()
.into_bytes();
assert_eq!(
extract_ldd_version(&actual2),
Some(SimpleSemver::new(2, 40, 0)),
);
}

}
Loading