Improved checking for DTSTAMP and UID for ValidObject in CalendarEvent.

diff --git a/source/objects/calendarevent/CalendarEvent.cpp b/source/objects/calendarevent/CalendarEvent.cpp
index 6c1887d..d175eed 100644 (file)
--- a/source/objects/calendarevent/CalendarEvent.cpp
+++ b/source/objects/calendarevent/CalendarEvent.cpp
@@ -9,6 +9,7 @@ CalendarObjectValidResult CalendarEventObject::ValidObject(){
        bool ValidDateTimeStamp = false;
        bool ValidUniqueID = false;
        int SeekCount = 0;
+       string PropertyName;
        
        // Look for BEGIN:VEVENT.
        
@@ -44,8 +45,16 @@ CalendarObjectValidResult CalendarEventObject::ValidObject(){
        
        for (vector<string>::iterator iter = ObjectName.begin();
                iter != ObjectName.end(); iter++){
-       
-               if (ObjectName[SeekCount] == "DTSTAMP"){
+                       
+               try{
+                       PropertyName = ObjectName[SeekCount].substr(0,7);
+               }
+                       
+               catch(const out_of_range& oor){
+                       continue;
+               }
+               
+               if (PropertyName == "DTSTAMP"){
                        
                        if (ValidDateTimeStamp == false){
                                ValidDateTimeStamp = true;
@@ -66,7 +75,15 @@ CalendarObjectValidResult CalendarEventObject::ValidObject(){
        for (vector<string>::iterator iter = ObjectName.begin();
                iter != ObjectName.end(); iter++){
        
-               if (ObjectName[SeekCount] == "UID"){
+               try{
+                       PropertyName = ObjectName[SeekCount].substr(0,3);
+               }
+               
+               catch(const out_of_range& oor){
+                       continue;
+               }
+                       
+               if (PropertyName == "UID"){
                        
                        if (ValidUniqueID == false){
                                ValidUniqueID = true;