[Supertuxkart-commit] SF.net SVN: supertuxkart:[6634] main/trunk/src/challenges/challenge.cpp

[<au...@us...>]

Revision: 6634
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=6634&view=rev
Author:   auria
Date:     2010-11-18 02:38:06 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
More sanity checks with challenges + avoid crashing at all costs when bad challenges are found

Modified Paths:
--------------
    main/trunk/src/challenges/challenge.cpp

Modified: main/trunk/src/challenges/challenge.cpp
===================================================================
--- main/trunk/src/challenges/challenge.cpp	2010-11-17 21:25:36 UTC (rev 6633)
+++ main/trunk/src/challenges/challenge.cpp	2010-11-18 02:38:06 UTC (rev 6634)
@@ -37,7 +37,11 @@
     {
         case UNLOCK_TRACK:
         {    // {} avoids compiler warning
-            Track* track = track_manager->getTrack( name );
+            const Track* track = track_manager->getTrack( name );
+            
+            // shouldn't happen but let's avoid crashes as much as possible...
+            if (track == NULL) return irr::core::stringw( L"????" );
+            
             return StringUtils::insertValues(_("New track '%s' now available"), 
                                              track->getName().c_str() );
             break;
@@ -49,7 +53,12 @@
         }
         case UNLOCK_GP:
         {
-            const irr::core::stringw& gp_user_name = grand_prix_manager->getGrandPrix(name)->getName();
+            const GrandPrixData* gp = grand_prix_manager->getGrandPrix(name);
+            
+            // shouldn't happen but let's avoid crashes as much as possible...
+            if (gp == NULL) return irr::core::stringw( L"????" );
+            
+            const irr::core::stringw& gp_user_name = gp->getName();
             return StringUtils::insertValues(_("New Grand Prix '%s' now available"),
                                                 gp_user_name.c_str());
         }
@@ -60,7 +69,11 @@
         }
         case UNLOCK_KART:
         {
-            const KartProperties *kp=kart_properties_manager->getKart( name );
+            const KartProperties* kp = kart_properties_manager->getKart( name );
+            
+            // shouldn't happen but let's avoid crashes as much as possible...
+            if (kp == NULL) return irr::core::stringw( L"????" );
+            
             return StringUtils::insertValues( _("New kart '%s' now available"),
                                               kp->getName().c_str());
         }
@@ -71,8 +84,15 @@
 }
 
 //-----------------------------------------------------------------------------
+
 void Challenge::addUnlockTrackReward(const std::string &track_name)
 {
+    
+    if (track_manager->getTrack(track_name) == NULL)
+    {
+        throw std::runtime_error(StringUtils::insertValues("Challenge refers to unknown track <%s>", track_name.c_str()));
+    }
+    
     UnlockableFeature feature;
     feature.name = track_name;
     feature.type = UNLOCK_TRACK;
@@ -80,6 +100,7 @@
 }
 
 //-----------------------------------------------------------------------------
+
 void Challenge::addUnlockModeReward(const std::string &internal_mode_name,
                                     const irr::core::stringw &user_mode_name)
 {    
@@ -93,6 +114,11 @@
 //-----------------------------------------------------------------------------
 void Challenge::addUnlockGPReward(const std::string &gp_name)
 {
+    if (grand_prix_manager->getGrandPrix(gp_name) == NULL)
+    {
+        throw std::runtime_error(StringUtils::insertValues("Challenge refers to unknown Grand Prix <%s>", gp_name.c_str()));
+    }
+    
     UnlockableFeature feature;
     
     feature.name = gp_name.c_str();
@@ -102,6 +128,7 @@
 }
 
 //-----------------------------------------------------------------------------
+
 void Challenge::addUnlockDifficultyReward(const std::string &internal_name, 
                                           const irr::core::stringw &user_name)
 {
@@ -116,6 +143,15 @@
 void Challenge::addUnlockKartReward(const std::string &internal_name, 
                                     const irr::core::stringw &user_name)
 {
+    try
+    {
+        kart_properties_manager->getKartId(internal_name);
+    }
+    catch (std::exception& e)
+    {
+        throw std::runtime_error(StringUtils::insertValues("Challenge refers to unknown kart <%s>", internal_name.c_str()));
+    }
+    
     UnlockableFeature feature;
     feature.name = internal_name;
     feature.type = UNLOCK_KART;


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