diff --git a/src/app-layer.c b/src/app-layer.c
index ebd91158e8..9924b8def0 100644
--- a/src/app-layer.c
+++ b/src/app-layer.c
@@ -569,6 +569,7 @@ int AppLayerHandleTCPData(ThreadVars *tv, TcpReassemblyThreadCtx *ra_ctx,
     SCEnter();
 
     DEBUG_ASSERT_FLOW_LOCKED(f);
+    DEBUG_VALIDATE_BUG_ON(data_len > (uint32_t)INT_MAX);
 
     AppLayerThreadCtx *app_tctx = ra_ctx->app_tctx;
     AppProto alproto;
diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index f8177d54c1..e48659a225 100644
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -1023,6 +1023,7 @@ static int ReassembleUpdateAppLayer (ThreadVars *tv,
 
     while (1) {
         GetAppBuffer(*stream, &mydata, &mydata_len, app_progress);
+        DEBUG_VALIDATE_BUG_ON(mydata_len > (uint32_t)INT_MAX);
         if (mydata == NULL && mydata_len > 0 && CheckGap(ssn, *stream, p)) {
             SCLogDebug("sending GAP to app-layer (size: %u)", mydata_len);