Skip to content

fix: prevent StackOverflowError from deeply nested GeometryCollection in GeoJsonParser #1699

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
ZeroX-404 wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −5
Open

fix: prevent StackOverflowError from deeply nested GeometryCollection in GeoJsonParser #1699

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions library/src/main/java/com/google/maps/android/data/geojson/GeoJsonParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,18 @@ private static LatLngBounds parseBoundingBox(JSONArray coordinates) throws JSONE
* @param geoJsonGeometry geometry object to parse
* @return Geometry object
*/
/** Maximum nesting depth for GeometryCollection to prevent stack overflow. */
private static final int MAX_GEOMETRY_DEPTH = 20;

public static Geometry parseGeometry(JSONObject geoJsonGeometry) {
return parseGeometry(geoJsonGeometry, 0);
}

private static Geometry parseGeometry(JSONObject geoJsonGeometry, int depth) {
if (depth > MAX_GEOMETRY_DEPTH) {
Log.w(LOG_TAG, "GeoJSON geometry nesting depth exceeds maximum (" + MAX_GEOMETRY_DEPTH + "), ignoring.");
return null;
}
try {
String geometryType = geoJsonGeometry.getString("type");
JSONArray geometryArray;
Expand All @@ -190,7 +201,7 @@ public static Geometry parseGeometry(JSONObject geoJsonGeometry) {
// No geometries or coordinates array
return null;
}
return createGeometry(geometryType, geometryArray);
return createGeometry(geometryType, geometryArray, depth);
} catch (JSONException e) {
return null;
}
Expand Down Expand Up @@ -239,7 +250,7 @@ private static HashMap<String, String> parseProperties(JSONObject properties)
* @return Geometry object
* @throws JSONException if the coordinates or geometries could be parsed
*/
private static Geometry createGeometry(String geometryType, JSONArray geometryArray)
private static Geometry createGeometry(String geometryType, JSONArray geometryArray, int depth)
throws JSONException {
switch (geometryType) {
case POINT:
Expand All @@ -255,7 +266,7 @@ private static Geometry createGeometry(String geometryType, JSONArray geometryAr
case MULTIPOLYGON:
return createMultiPolygon(geometryArray);
case GEOMETRY_COLLECTION:
return createGeometryCollection(geometryArray);
return createGeometryCollection(geometryArray, depth + 1);
}
return null;
}
Expand Down Expand Up @@ -360,13 +371,13 @@ private static GeoJsonMultiPolygon createMultiPolygon(JSONArray coordinates)
* @return GeoJsonGeometryCollection object
* @throws JSONException if geometries cannot be parsed
*/
private static GeoJsonGeometryCollection createGeometryCollection(JSONArray geometries)
private static GeoJsonGeometryCollection createGeometryCollection(JSONArray geometries, int depth)
throws JSONException {
ArrayList<Geometry> geometryCollectionElements
= new ArrayList<>();
for (int i = 0; i < geometries.length(); i++) {
JSONObject geometryElement = geometries.getJSONObject(i);
Geometry geometry = parseGeometry(geometryElement);
Geometry geometry = parseGeometry(geometryElement, depth);
if (geometry != null) {
// Do not add geometries that could not be parsed
geometryCollectionElements.add(geometry);
Expand Down