From 45677f2bb29d7d3c2c868402c9fd610aaa982e67 Mon Sep 17 00:00:00 2001
From: dswitkin <dswitkin@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Wed, 8 Oct 2008 15:37:38 +0000
Subject: [PATCH] Made calendar event parsing more robust, and also reject
 non-calendar contents a little faster.

git-svn-id: https://zxing.googlecode.com/svn/trunk@604 59b500cc-1b3d-0410-9834-0bbf25fbcc57
---
 .../google/zxing/client/result/VEventResultParser.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/com/google/zxing/client/result/VEventResultParser.java b/core/src/com/google/zxing/client/result/VEventResultParser.java
index 33a53dab2..2d37b38da 100644
--- a/core/src/com/google/zxing/client/result/VEventResultParser.java
+++ b/core/src/com/google/zxing/client/result/VEventResultParser.java
@@ -35,11 +35,13 @@ final class VEventResultParser extends ResultParser {
       return null;
     }
     int vEventStart = rawText.indexOf("BEGIN:VEVENT");
-    int vEventEnd = rawText.indexOf("END:VEVENT");
-    if (vEventStart < 0 || vEventEnd < 0) {
+    if (vEventStart < 0) {
+      return null;
+    }
+    int vEventEnd = rawText.indexOf("END:VEVENT");
+    if (vEventEnd < 0) {
       return null;
     }
-    rawText = rawText.substring(vEventStart + 14, vEventEnd); // skip over BEGIN:VEVENT\r\n at start
 
     String summary = VCardResultParser.matchSingleVCardPrefixedField("SUMMARY", rawText, true);
     String start = VCardResultParser.matchSingleVCardPrefixedField("DTSTART", rawText, true);