From 39dc0b6da5c414e098b7e44c5bda109587d0dae2 Mon Sep 17 00:00:00 2001 From: Jorge Ruesga Date: Mon, 13 Jul 2015 23:45:47 +0200 Subject: [PATCH 1/1] 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 --- src/com/cyanogenmod/eleven/utils/SrtParser.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 { -- 2.11.0