include/denc.h: throw exception if insufficient buffer during header decode

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/include/denc.h b/src/include/denc.h
index a7dd3cca4ff2b8e37cab29fcb8713e68d79f0b99..6cc53277b94502596b1eb8281937d3ad47cae487 100644 (file)
--- a/src/include/denc.h
+++ b/src/include/denc.h
@@ -38,7 +38,6 @@
 #include <boost/intrusive/set.hpp>
 #include <boost/optional.hpp>
 
-#include "include/ceph_assert.h"       // boost clobbers this
 #include "include/intarith.h"
 #include "include/int_types.h"
 #include "include/scope_guard.h"
@@ -1736,7 +1735,9 @@ inline std::enable_if_t<traits::supported && !traits::featured> decode_nohead(
                           uint32_t *struct_len) {                      \
     const char *pos = p.get_pos();                                     \
     char *end = *start_pos + *struct_len;                              \
-    ceph_assert(pos <= end);                                                   \
+    if (pos > end) {                                                   \
+      throw ::ceph::buffer::malformed_input(__PRETTY_FUNCTION__);      \
+    }                                                                  \
     if (pos < end) {                                                   \
       p += end - pos;                                                  \
     }                                                                  \