这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@koppa
Copy link
Contributor

@koppa koppa commented Oct 23, 2018

When having an malformed json input in the extra-keys property, the termux-app crashes later with an NullpointerException due to an uninitialized mExtraKeys variable.

This fix improves the parsing of the properties file. In case of an invalid "extra-keys" property, the variable will be initialized with length 0.

@Grimler91
Copy link
Member

Great, we most certainly need more verification :)

I also see that you've added an alternative config path (just mentioning it since it's worth mentioning)

@koppa
Copy link
Contributor Author

koppa commented Oct 23, 2018

I also see that you've added an alternative config path (just mentioning it since it's worth mentioning)

Nope, that wasn't me, this is already in master.

I just splitted the try-catch clause into two parts: One for IOException handling and the other for parsing the JSON of extra-keys

@Grimler91
Copy link
Member

Nope, that wasn't me, this is already in master.

Ah sorry, I blame my small phone screen.
Anyways, great!

@fornwall fornwall merged commit af445f9 into termux:master Oct 25, 2018
@fornwall
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants