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

[<ral...@us...>]

Revision: 9176
          http://sourceforge.net/p/planeshift/code/9176
Author:   ralphcampbell
Date:     2014-01-02 19:11:09 +0000 (Thu, 02 Jan 2014)
Log Message:
-----------
Fix CID 1138881 by deleting craftInfo if error.

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

Modified: trunk/src/server/cachemanager.cpp
===================================================================
--- trunk/src/server/cachemanager.cpp	2014-01-02 02:06:21 UTC (rev 9175)
+++ trunk/src/server/cachemanager.cpp	2014-01-02 19:11:09 UTC (rev 9176)
@@ -1749,7 +1749,6 @@
     //    uint32	resultID = t->GetResultId();
 
     csArray<psTradeProcesses*>* procArray = GetTradeProcessesByID(processID);
-    CraftTransInfo* craftInfo;
 
     if(procArray)
     {
@@ -1758,7 +1757,7 @@
             psTradeProcesses* proc = procArray->Get(k);
             if(proc->GetSubprocessId()==0)
             {
-                craftInfo = new CraftTransInfo;
+                CraftTransInfo* craftInfo = new CraftTransInfo;
 
                 craftInfo->priSkillId = proc->GetPrimarySkillId();
                 craftInfo->minPriSkill = proc->GetMinPrimarySkill();
@@ -1771,6 +1770,8 @@
                     craftInfo->craftStepDescription.Insert(0, "   ");
                     newArray->Push(craftInfo);
                 }
+                else
+                    delete craftInfo;
             }
         }
     }

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