Skip to content
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

Jump to bottom

Fix segmentation fault that brings while resolving bundled engine #488

Merged
merged 3 commits into from
Nov 21, 2022
Merged

Fix segmentation fault that brings while resolving bundled engine #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eca7a3d
Add segfault-handler package for investigation
yhatt Nov 21, 2022
d593f5b
Fix segment fault while engine resolution
yhatt Nov 21, 2022
3835d82
[ci skip] Update CHANGELOG.md
yhatt Nov 21, 2022
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: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### Fixed

- Fix segmentation fault that brings while resolving bundled engine ([#487](https://github.com/marp-team/marp-cli/issues/487), [#488](https://github.com/marp-team/marp-cli/pull/488))

## v2.2.1 - 2022-11-20

### Added
Expand Down
17 changes: 11 additions & 6 deletions src/engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ export class ResolvedEngine {
process.env.NODE_ENV === 'test'
) {
ResolvedEngine._defaultEngine = await ResolvedEngine.resolve([
'@marp-team/marp-core',
delayedEngineResolver(
async () => (await import('@marp-team/marp-core')).Marp
),
'@marp-team/marp-core', // Manually-installed Marp Core

// Bundled Marp Core
// eslint-disable-next-line @typescript-eslint/no-var-requires -- import statement brings segmentation fault: https://github.com/marp-team/marp-cli/issues/487
delayedEngineResolver(async () => require('@marp-team/marp-core').Marp),
])
}
return ResolvedEngine._defaultEngine
Expand All @@ -62,7 +63,9 @@ export class ResolvedEngine {
(from && importFrom.silent(path.dirname(path.resolve(from)), eng)) ||
importFrom.silent(process.cwd(), eng)

if (resolved?.__esModule) resolved = resolved.default
if (resolved && typeof resolved === 'object' && 'default' in resolved) {
resolved = resolved.default
}
} else if (typeof eng === 'object' && eng[delayedEngineResolverSymbol]) {
resolved = await eng[delayedEngineResolverSymbol]()
} else {
Expand Down Expand Up @@ -97,7 +100,9 @@ export class ResolvedEngine {

if (
expt === klass ||
(expt?.__esModule && Object.values(expt).includes(klass))
(expt &&
typeof expt === 'object' &&
Object.values(expt).includes(klass))
)
return moduleId
}
Expand Down