mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

v.pkgconfig: fix infinite recursion bug when parsing dependencies (#16342)

Browse Source
This commit is contained in:
pancake 2022-11-06 06:22:50 +01:00 committed by GitHub
parent ca484430e0
commit e3fed4c3eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/v/pkgconfig/pkgconfig.v
View File

@ -46,6 +46,7 @@ pub mut:
requires []string requires []string
requires_private []string requires_private []string
conflicts []string conflicts []string
loaded []string
} }
fn (mut pc PkgConfig) parse_list_no_comma(s string) []string { fn (mut pc PkgConfig) parse_list_no_comma(s string) []string {
@ -199,8 +200,13 @@ fn (mut pc PkgConfig) load_requires() ? {
} }
fn (mut pc PkgConfig) load_require(dep string) ? { fn (mut pc PkgConfig) load_require(dep string) ? {
if dep in pc.loaded {
return
}
pc.loaded << dep
mut pcdep := PkgConfig{ mut pcdep := PkgConfig{
paths: pc.paths paths: pc.paths
loaded: pc.loaded
} }
depfile := pcdep.resolve(dep) or { depfile := pcdep.resolve(dep) or {
if pc.options.debug { if pc.options.debug {
@ -211,7 +217,9 @@ fn (mut pc PkgConfig) load_require(dep string) ? {
if !pcdep.parse(depfile) { if !pcdep.parse(depfile) {
return error('required file "$depfile" could not be parsed') return error('required file "$depfile" could not be parsed')
} }
if !pc.options.norecurse {
pcdep.load_requires()? pcdep.load_requires()?
}
pc.extend(pcdep)? pc.extend(pcdep)?
} }