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

JS: Fix crash in case of string literal in export specifier #18452

Merged
merged 4 commits into from
Jan 9, 2025
+23 −4
Merged

JS: Fix crash in case of string literal in export specifier #18452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db98880
JS: Add crash reproduction to test case
asgerf Jan 9, 2025
138b000
JS: Coerce the local export node to an Identifier
asgerf Jan 9, 2025
fd5a3da
JS: One more test
asgerf Jan 9, 2025
a7fbfb2
JS: Change note
asgerf Jan 9, 2025
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
3 changes: 2 additions & 1 deletion javascript/extractor/src/com/semmle/ts/extractor/TypeScriptASTConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,8 @@ private Node convertExportDeclaration(JsonObject node, SourceLocation loc) throw
}

private Node convertExportSpecifier(JsonObject node, SourceLocation loc) throws ParseError {
Identifier local = convertChild(node, hasChild(node, "propertyName") ? "propertyName" : "name");
JsonObject localToken = node.get(hasChild(node, "propertyName") ? "propertyName" : "name").getAsJsonObject();
Identifier local = convertNodeAsIdentifier(localToken);
JsonObject exportedToken = node.get("name").getAsJsonObject();
Identifier exported = convertNodeAsIdentifier(exportedToken);

Expand Down
5 changes: 5 additions & 0 deletions javascript/ql/src/change-notes/2025-01-09-import-spec-strings.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
category: fix
---
* Fixed a TypeScript extractor crash that would occur when encountering an export specifier
whose local specifier was a string literal.
5 changes: 4 additions & 1 deletion javascript/ql/test/library-tests/Modules/arbitrarySpecifier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ import { "Foo::new" as Foo_new } from "./foo.wasm"
const foo = Foo_new()

export { Foo_new as "Foo::new" }
export type * as "Foo_types" from './mod'
export type * as "Foo_types" from './mod'

export { "<X>" as "<Y>" } from "somewhere";
export { "<X>" } from "somewhere";
14 changes: 12 additions & 2 deletions javascript/ql/test/library-tests/Modules/tests.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ test_ExportDeclarations
| a.js:5:1:5:32 | export ... } = o; |
| arbitrarySpecifier.ts:5:1:5:32 | export ... :new" } |
| arbitrarySpecifier.ts:6:1:6:41 | export ... './mod' |
| arbitrarySpecifier.ts:8:1:8:43 | export ... where"; |
| arbitrarySpecifier.ts:9:1:9:34 | export ... where"; |
| b.js:5:1:5:18 | export { f as g }; |
| b.js:7:1:7:21 | export ... './a'; |
| d.js:4:1:4:20 | export * from 'm/c'; |
Expand All @@ -22,6 +24,8 @@ test_ExportDefaultDeclarations
| es2015_require.js:3:1:3:25 | export ... ss C {} |
test_ExportSpecifiers
| arbitrarySpecifier.ts:5:10:5:30 | Foo_new ... o::new" | arbitrarySpecifier.ts:5:10:5:16 | Foo_new | arbitrarySpecifier.ts:5:21:5:30 | "Foo::new" |
| arbitrarySpecifier.ts:8:10:8:23 | "<X>" as "<Y>" | arbitrarySpecifier.ts:8:10:8:14 | "<X>" | arbitrarySpecifier.ts:8:19:8:23 | "<Y>" |
| arbitrarySpecifier.ts:9:10:9:14 | "<X>" | arbitrarySpecifier.ts:9:10:9:14 | "<X>" | arbitrarySpecifier.ts:9:10:9:14 | "<X>" |
| b.js:5:10:5:15 | f as g | b.js:5:10:5:10 | f | b.js:5:15:5:15 | g |
| e.js:2:10:2:10 | x | e.js:2:10:2:10 | x | e.js:2:10:2:10 | x |
| e.js:2:13:2:13 | y | e.js:2:13:2:13 | y | e.js:2:13:2:13 | y |
Expand Down Expand Up @@ -81,8 +85,8 @@ test_Module_exports
| a.js:1:1:5:32 | <toplevel> | default | a.js:1:16:3:1 | functio ... n 23;\\n} |
| a.js:1:1:5:32 | <toplevel> | x | a.js:5:18:5:20 | f() |
| a.js:1:1:5:32 | <toplevel> | y | a.js:5:25:5:25 | y |
| arbitrarySpecifier.ts:1:1:6:41 | <toplevel> | Foo::new | arbitrarySpecifier.ts:5:10:5:16 | Foo_new |
| arbitrarySpecifier.ts:1:1:6:41 | <toplevel> | Foo_types | arbitrarySpecifier.ts:6:13:6:28 | * as "Foo_types" |
| arbitrarySpecifier.ts:1:1:10:0 | <toplevel> | Foo::new | arbitrarySpecifier.ts:5:10:5:16 | Foo_new |
| arbitrarySpecifier.ts:1:1:10:0 | <toplevel> | Foo_types | arbitrarySpecifier.ts:6:13:6:28 | * as "Foo_types" |
| b.js:1:1:8:0 | <toplevel> | f2 | a.js:1:16:3:1 | functio ... n 23;\\n} |
| b.js:1:1:8:0 | <toplevel> | g | b.js:5:10:5:10 | f |
| e.js:1:1:4:0 | <toplevel> | g | a.js:1:16:3:1 | functio ... n 23;\\n} |
Expand All @@ -109,6 +113,8 @@ test_OtherImports
| import-indirect-path.js:5:1:5:14 | require(x + y) | a.js:1:1:5:32 | <toplevel> |
test_ReExportDeclarations
| arbitrarySpecifier.ts:6:1:6:41 | export ... './mod' | arbitrarySpecifier.ts:6:35:6:41 | './mod' |
| arbitrarySpecifier.ts:8:1:8:43 | export ... where"; | arbitrarySpecifier.ts:8:32:8:42 | "somewhere" |
| arbitrarySpecifier.ts:9:1:9:34 | export ... where"; | arbitrarySpecifier.ts:9:23:9:33 | "somewhere" |
| b.js:7:1:7:21 | export ... './a'; | b.js:7:16:7:20 | './a' |
| d.js:4:1:4:20 | export * from 'm/c'; | d.js:4:15:4:19 | 'm/c' |
| e.js:3:1:3:35 | export ... './a'; | e.js:3:30:3:34 | './a' |
Expand All @@ -128,6 +134,8 @@ test_getAnImportedModule
test_getExportedName
| arbitrarySpecifier.ts:5:10:5:30 | Foo_new ... o::new" | Foo::new |
| arbitrarySpecifier.ts:6:13:6:28 | * as "Foo_types" | Foo_types |
| arbitrarySpecifier.ts:8:10:8:23 | "<X>" as "<Y>" | <Y> |
| arbitrarySpecifier.ts:9:10:9:14 | "<X>" | <X> |
| b.js:5:10:5:15 | f as g | g |
| b.js:7:8:7:9 | f2 | f2 |
| e.js:2:10:2:10 | x | x |
Expand All @@ -152,6 +160,8 @@ test_getImportedName
| unresolved.js:1:8:1:8 | f | default |
test_getLocalName
| arbitrarySpecifier.ts:5:10:5:30 | Foo_new ... o::new" | Foo_new |
| arbitrarySpecifier.ts:8:10:8:23 | "<X>" as "<Y>" | <X> |
| arbitrarySpecifier.ts:9:10:9:14 | "<X>" | <X> |
| b.js:5:10:5:15 | f as g | f |
| b.js:7:8:7:9 | f2 | default |
| e.js:2:10:2:10 | x | x |
Expand Down
Loading