[PlaneShift-svn] SF.net SVN: planeshift:[4737] trunk/src/server/npcmanager.cpp

[<wel...@us...>]

Revision: 4737
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4737&view=rev
Author:   weltall2
Date:     2009-11-13 20:55:40 +0000 (Fri, 13 Nov 2009)

Log Message:
-----------
checking sscanf return

Modified Paths:
--------------
    trunk/src/server/npcmanager.cpp

Modified: trunk/src/server/npcmanager.cpp
===================================================================
--- trunk/src/server/npcmanager.cpp	2009-11-13 14:54:42 UTC (rev 4736)
+++ trunk/src/server/npcmanager.cpp	2009-11-13 20:55:40 UTC (rev 4737)
@@ -262,21 +262,29 @@
         tm* tm_old = localtime(&old);
 
         int year;
+        //if the data is invalid ignore checking it and start from scratch
+        bool ignoreOldDate = (curDate.IsEmpty() || curTime.IsEmpty()); 
 
-        if(!curDate.IsEmpty() && !curTime.IsEmpty())
+        if(!ignoreOldDate)
         {
-            sscanf(curDate, "%d-%d-%d", &year, &tm_old->tm_mon, &tm_old->tm_mday);
-            year = year - 1900;
-            tm_old->tm_year = year;
-
-            sscanf(curTime, "%d:%d:%d", &tm_old->tm_hour, &tm_old->tm_min, &tm_old->tm_sec);
-            old = mktime(tm_old);
+            int result =  sscanf(curDate, "%d-%d-%d", &year, &tm_old->tm_mon, &tm_old->tm_mday);
+            int result2 = sscanf(curTime, "%d:%d:%d", &tm_old->tm_hour, &tm_old->tm_min, &tm_old->tm_sec);
+            if(result != 3 || result2 != 3)
+            {
+                ignoreOldDate = true;
+            }
+            else
+            {            
+                year = year - 1900;
+                tm_old->tm_year = year;            
+                old = mktime(tm_old);
+            }
         }
         time_t curr;
         time(&curr);
         tm* tm_curr = localtime(&curr);
 
-        if (curDate.IsEmpty() || curTime.IsEmpty() || difftime(curr, old) >= 240*60)
+        if (ignoreOldDate || difftime(curr, old) >= 240*60)
         {
             year = tm_curr->tm_year+1900;
             curDate.Format("%d-%d-%d", year, tm_curr->tm_mon, tm_curr->tm_mday);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.