From f90f3a05be2aaf9faf554372db25bdfa6f71d9bf Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 9 Jul 2015 13:11:43 -0700 Subject: [PATCH] Fail in Packet::create if size is invalid --- assignment-client/src/octree/OctreeQueryNode.h | 1 - libraries/networking/src/Packet.cpp | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/assignment-client/src/octree/OctreeQueryNode.h b/assignment-client/src/octree/OctreeQueryNode.h index faec2d2bba..6316cc5e86 100644 --- a/assignment-client/src/octree/OctreeQueryNode.h +++ b/assignment-client/src/octree/OctreeQueryNode.h @@ -14,7 +14,6 @@ #include - #include #include #include diff --git a/libraries/networking/src/Packet.cpp b/libraries/networking/src/Packet.cpp index 6d585ac4aa..876cd91962 100644 --- a/libraries/networking/src/Packet.cpp +++ b/libraries/networking/src/Packet.cpp @@ -29,10 +29,9 @@ std::unique_ptr Packet::create(PacketType::Value type, qint64 size) { // default size of -1, means biggest packet possible size = maxPayload; } - if (size <= 0 || size > maxPayload) { - // Invalid size, return null pointer - return std::unique_ptr(); - } + + // Fail with invalid size + Q_ASSERT(size >= 0 || size < maxPayload); // allocate memory return std::unique_ptr(new Packet(type, size));