(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.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp
index 0de5b279d..b316b0297 100644
--- 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;