Skip to content

Fix crashes when parsing malformed menus #15

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
jnlon wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix crashes when parsing malformed menus #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c06f1c5
Fix crash when parseInt fails on port
jnlon Aug 22, 2019
991b071
Catch possible string index OOB exception
jnlon Aug 29, 2019
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
26 changes: 19 additions & 7 deletions app/src/main/java/com/gmail/afonsotrepa/pocketgopher/gopherclient/Connection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,25 @@ else if (linesplit.length < 4)
}
else
{
response.add(Page.makePage(
line.charAt(0), //type
linesplit[1],
linesplit[2],
Integer.parseInt(linesplit[3]),
linesplit[0].substring(1) //remove the type tag
));
try
{
// verify the port parses as an integer
int port = Integer.parseInt(linesplit[3].trim());
// add the response
response.add(Page.makePage(
line.charAt(0), //type
linesplit[1],
linesplit[2],
port,
linesplit[0].substring(1) //remove the type tag
));
}
catch (StringIndexOutOfBoundsException | NumberFormatException e)
{
// something went wrong, show an unknown page entry
response.add(new UnknownPage(line));
}

}
}

Expand Down