Skip to content

fix(geo): remove unsafe and unnecessary new Function when parsing GeoJSON input #21640

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

Open
plainheart wants to merge 2 commits into
base: release
Choose a base branch
from
+3 −7
Open

fix(geo): remove unsafe and unnecessary new Function when parsing GeoJSON input #21640

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cc409e
fix(geo): fix `GeoJSONResource.parseInput` - remove unsafe and unnece…
plainheart May 31, 2026
baed728
chore: fix typo in comment
plainheart May 31, 2026
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
10 changes: 3 additions & 7 deletions src/coord/geo/GeoJSONResource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export class GeoJSONResource implements GeoResource {
fixTextCoord(mapName, region);
fixDiaoyuIsland(mapName, region);

// Some area like Alaska in USA map needs to be tansformed
// Some area like Alaska in USA map needs to be transformed
// to look better
const specialArea = this._specialAreas && this._specialAreas[regionName];
if (specialArea) {
Expand All @@ -141,7 +141,7 @@ export class GeoJSONResource implements GeoResource {
return {
// For backward compatibility, use geoJson
// PENDING: it has been returning them without clone.
// do we need to avoid outsite modification?
// do we need to avoid outside modification?
geoJson: this._geoJSON,
geoJSON: this._geoJSON,
specialAreas: this._specialAreas
Expand All @@ -161,9 +161,5 @@ function calculateBoundingRect(regions: GeoJSONRegion[]): BoundingRect {
}

function parseInput(source: GeoJSONSourceInput): GeoJSON | GeoJSONCompressed {
return !isString(source)
? source
: (typeof JSON !== 'undefined' && JSON.parse)
? JSON.parse(source)
: (new Function('return (' + source + ');'))();
return !isString(source) ? source : JSON.parse(source);
}
Comment on lines 163 to 165
Copy link
Copy Markdown
Member Author

@plainheart plainheart May 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@100pah As the current codebase, do you think it is necessary to add JSON API check?