[Planeshift-cvs] CVS: planeshift/src/server psserverchar.cpp, 1.407, 1.408

[Andy D. <kha...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10719/src/server

Modified Files:
	psserverchar.cpp 
Log Message:
- Fixed a crash when trying to move a non-existant item.

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.407
retrieving revision 1.408
diff -C2 -d -r1.407 -r1.408
*** psserverchar.cpp	19 Nov 2006 18:26:14 -0000	1.407
--- psserverchar.cpp	19 Nov 2006 19:39:02 -0000	1.408
***************
*** 2971,2974 ****
--- 2971,2976 ----
          case CONTAINER_INVENTORY_BULK:
              item = from->Inventory().GetBulkItem(fromSlot);
+             if(!item)
+                 break;
              origStackCount = item->GetStackCount();
              item->SetStackCount(quantity);
***************
*** 2979,2983 ****
--- 2981,2989 ----
          case CONTAINER_EXCHANGE_OFFERING:
              exchange = psserver->exchangemanager->GetExchange( fromClient->ExchangeID() );            
+             if(!exchange)
+                 break;
              item = exchange->GetItem(fromClient, fromSlot);
+             if(!item)
+                 break;
              origStackCount = item->GetStackCount();
              item->SetStackCount(quantity);