Commitc34cd51

authored

Merge pull request#424 from eriksjolund/mkcomposefs-handle-failed_path-NULL

mkcomposefs: handle failed_path NULL from lcfs_build()

2 parents233177a +91da735 commitc34cd51Copy full SHA for c34cd51

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1690,8 +1690,11 @@ int main(int argc, char **argv)`
`1690`	`1690`	`buildflag_copy \|=LCFS_BUILD_NO_INLINE;`
`1691`	`1691`
`1692`	`1692`	`root=lcfs_build(AT_FDCWD,src_path,buildflag_copy,&failed_path);`
`1693`		`-if (root==NULL)`
`1694`		`-err(EXIT_FAILURE,"error accessing %s",failed_path);`
	`1693`	`+if (root==NULL) {`
	`1694`	`+// An allocation error in maybe_join_path() can cause`
	`1695`	`+// failed_path to be set to NULL`
	`1696`	`+err(EXIT_FAILURE,"error accessing %s",failed_path ?:"");`
	`1697`	`+}`
`1695`	`1698`
`1696`	`1699`	`if (compute_digest(threads,root,src_path,buildflags)<0)`
`1697`	`1700`	`err(EXIT_FAILURE,"error computing digest");`

Comments

(0)