mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-14 16:40:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

AbstractHafasClientInterfaceProvider: Avoid infinite parseLoc() recursions.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-16 13:05:50 +01:00
parent 2e8edc117d
commit 52e6fc3aab
1 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
enabler/src/de/schildbach/pte/AbstractHafasClientInterfaceProvider.java
View file

@ -29,6 +29,7 @@ import java.util.Currency;
import java.util.Date; import java.util.Date;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@ -299,7 +300,7 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
final Line line = lines.get(stbStop.getInt("dProdX")); final Line line = lines.get(stbStop.getInt("dProdX"));
final Location location = equivs ? parseLoc(locList, stbStop.getInt("locX")) final Location location = equivs ? parseLoc(locList, stbStop.getInt("locX"), null)
: new Location(LocationType.STATION, stationId); : new Location(LocationType.STATION, stationId);
final Position position = normalizePosition(stbStopPlatformS); final Position position = normalizePosition(stbStopPlatformS);
@ -310,7 +311,7 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
final int lastStopIdx = stopList.getJSONObject(stopList.length() - 1).getInt("locX"); final int lastStopIdx = stopList.getJSONObject(stopList.length() - 1).getInt("locX");
final String lastStopName = locList.getJSONObject(lastStopIdx).getString("name"); final String lastStopName = locList.getJSONObject(lastStopIdx).getString("name");
if (jnyDirTxt.equals(lastStopName)) if (jnyDirTxt.equals(lastStopName))
destination = parseLoc(locList, lastStopIdx); destination = parseLoc(locList, lastStopIdx, null);
else else
destination = new Location(LocationType.ANY, null, null, jnyDirTxt); destination = new Location(LocationType.ANY, null, null, jnyDirTxt);
} else { } else {
@ -516,8 +517,8 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
final List<Trip> trips = new ArrayList<>(outConList.length()); final List<Trip> trips = new ArrayList<>(outConList.length());
for (int iOutCon = 0; iOutCon < outConList.length(); iOutCon++) { for (int iOutCon = 0; iOutCon < outConList.length(); iOutCon++) {
final JSONObject outCon = outConList.getJSONObject(iOutCon); final JSONObject outCon = outConList.getJSONObject(iOutCon);
final Location tripFrom = parseLoc(locList, outCon.getJSONObject("dep").getInt("locX")); final Location tripFrom = parseLoc(locList, outCon.getJSONObject("dep").getInt("locX"), null);
final Location tripTo = parseLoc(locList, outCon.getJSONObject("arr").getInt("locX")); final Location tripTo = parseLoc(locList, outCon.getJSONObject("arr").getInt("locX"), null);
c.clear(); c.clear();
ParserUtils.parseIsoDate(c, outCon.getString("date")); ParserUtils.parseIsoDate(c, outCon.getString("date"));
@ -733,9 +734,9 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
throw new RuntimeException("cannot parse: '" + str + "'"); throw new RuntimeException("cannot parse: '" + str + "'");
} }
private Stop parseJsonStop(final JSONObject json, final JSONArray locList, final Calendar c, private Stop parseJsonStop(final JSONObject json, final JSONArray locList, final Calendar c, final Date baseDate)
final Date baseDate) throws JSONException { throws JSONException {
final Location location = parseLoc(locList, json.getInt("locX")); final Location location = parseLoc(locList, json.getInt("locX"), null);
final boolean arrivalCancelled = json.optBoolean("aCncl", false); final boolean arrivalCancelled = json.optBoolean("aCncl", false);
final Date plannedArrivalTime = parseJsonTime(c, baseDate, json.optString("aTimeS", null)); final Date plannedArrivalTime = parseJsonTime(c, baseDate, json.optString("aTimeS", null));
@ -770,11 +771,12 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
private List<Location> parseLocList(final JSONArray locList) throws JSONException { private List<Location> parseLocList(final JSONArray locList) throws JSONException {
final List<Location> locations = new ArrayList<>(locList.length()); final List<Location> locations = new ArrayList<>(locList.length());
for (int iLoc = 0; iLoc < locList.length(); iLoc++) for (int iLoc = 0; iLoc < locList.length(); iLoc++)
locations.add(parseLoc(locList, iLoc)); locations.add(parseLoc(locList, iLoc, null));
return locations; return locations;
} }
private Location parseLoc(final JSONArray locList, final int locListIndex) throws JSONException { private Location parseLoc(final JSONArray locList, final int locListIndex,
@Nullable Set<Integer> previousLocListIndexes) throws JSONException {
final JSONObject loc = locList.getJSONObject(locListIndex); final JSONObject loc = locList.getJSONObject(locListIndex);
final String type = loc.getString("type"); final String type = loc.getString("type");
@ -784,8 +786,14 @@ public abstract class AbstractHafasClientInterfaceProvider extends AbstractHafas
final Set<Product> products; final Set<Product> products;
if ("S".equals(type)) { if ("S".equals(type)) {
final int mMastLocX = loc.optInt("mMastLocX", -1); final int mMastLocX = loc.optInt("mMastLocX", -1);
if (mMastLocX != -1 && mMastLocX != locListIndex) if (mMastLocX != -1) {
return parseLoc(locList, mMastLocX); if (previousLocListIndexes == null)
previousLocListIndexes = new HashSet<>();
if (!previousLocListIndexes.contains(mMastLocX)) {
previousLocListIndexes.add(locListIndex);
return parseLoc(locList, mMastLocX, previousLocListIndexes);
}
}
locationType = LocationType.STATION; locationType = LocationType.STATION;
id = normalizeStationId(loc.getString("extId")); id = normalizeStationId(loc.getString("extId"));
placeAndName = splitStationName(loc.getString("name")); placeAndName = splitStationName(loc.getString("name"));