summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Ruesga <jorge@ruesga.com>2015-07-13 23:45:47 +0200
committerJorge Ruesga <jorge@ruesga.com>2015-07-13 23:45:47 +0200
commit39dc0b6da5c414e098b7e44c5bda109587d0dae2 (patch)
treecb5e8c89f9dbf116efae631e93c50170909d3ca2
parent0481caf3ceecf6186b992e00c7118f182808e8a8 (diff)
downloadandroid_packages_apps_Eleven-39dc0b6da5c414e098b7e44c5bda109587d0dae2.tar.gz
android_packages_apps_Eleven-39dc0b6da5c414e098b7e44c5bda109587d0dae2.tar.bz2
android_packages_apps_Eleven-39dc0b6da5c414e098b7e44c5bda109587d0dae2.zip
eleven: fix invalid srt formats
Check for invalid time formats in srt files too. If there is an exception loading the file just throw out the entire file. Change-Id: Ic6011f843d1c433e9d8d84281c1c98dc5deaf547 JIRA: NIGHTLIES-1552 Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
-rw-r--r--src/com/cyanogenmod/eleven/utils/SrtParser.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/eleven/utils/SrtParser.java b/src/com/cyanogenmod/eleven/utils/SrtParser.java
index a5d4ccc..2b27890 100644
--- a/src/com/cyanogenmod/eleven/utils/SrtParser.java
+++ b/src/com/cyanogenmod/eleven/utils/SrtParser.java
@@ -89,12 +89,18 @@ public class SrtParser {
ret.add(entry);
}
+ } catch (NumberFormatException nfe) {
+ // The file isn't a valid srt format
+ Log.e(TAG, nfe.getMessage(), nfe);
+ ret = null;
} catch (IOException ioe) {
// shouldn't happen
Log.e(TAG, ioe.getMessage(), ioe);
+ ret = null;
} catch (ArrayIndexOutOfBoundsException e) {
// if the time is malformed
Log.e(TAG, e.getMessage());
+ ret = null;
} finally {
if (br != null) {
try {