mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-11-10 04:54:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix two rare crashes from bad input / state

Browse source
This commit is contained in:
Sean Owen 2015-09-22 22:24:30 +01:00
parent 55b7c3e763
commit e0ea32f217
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/com/google/zxing/client/android/share/BookmarkAdapter.java
View file

@ -46,7 +46,7 @@ final class BookmarkAdapter extends BaseAdapter {
@Override @Override
public int getCount() { public int getCount() {
return cursor.getCount(); return cursor.isClosed() ? 0 : cursor.getCount();
} }
@Override @Override

4
core/src/main/java/com/google/zxing/client/result/EmailAddressResultParser.java
View file

@ -41,7 +41,11 @@ public final class EmailAddressResultParser extends ResultParser {
if (queryStart >= 0) { if (queryStart >= 0) {
hostEmail = hostEmail.substring(0, queryStart); hostEmail = hostEmail.substring(0, queryStart);
} }
try {
hostEmail = urlDecode(hostEmail); hostEmail = urlDecode(hostEmail);
} catch (IllegalArgumentException iae) {
return null;
}
String[] tos = null; String[] tos = null;
if (!hostEmail.isEmpty()) { if (!hostEmail.isEmpty()) {
tos = COMMA.split(hostEmail); tos = COMMA.split(hostEmail);