(svn r10404) -Fix (r10266): Adding a cargo packet to cargo list could overflow. Now we detect this and just leave the cargo in its own packet.

17 years ago · 7ce52ca8b7
parent e5e4a5348f
commit 7ce52ca8b7
1 changed files with 1 additions and 1 deletions
--- a/src/cargopacket.cpp
+++ b/src/cargopacket.cpp
@ -228,7 +228,7 @@ void CargoList::Append(CargoPacket *cp)
 	assert(cp->IsValid());

 	for (List::iterator it = packets.begin(); it != packets.end(); it++) {
-		if ((*it)->SameSource(cp)) {
+		if ((*it)->SameSource(cp) && (*it)->count + cp->count <= 65535) {
 			(*it)->count        += cp->count;
 			(*it)->feeder_share += cp->feeder_share;
 			delete cp;