diff --git a/libfreerdp/core/orders.c b/libfreerdp/core/orders.c
index 327baae6a..21eb79d0e 100644
--- a/libfreerdp/core/orders.c
+++ b/libfreerdp/core/orders.c
@@ -2354,6 +2354,8 @@ static CACHE_BITMAP_ORDER* update_read_cache_bitmap_order(rdpUpdate* update, wSt
 				goto fail;
 
 			Stream_Read(s, bitmapComprHdr, 8); /* bitmapComprHdr (8 bytes) */
+			if (cache_bitmap->bitmapLength < 8)
+				goto fail;
 			cache_bitmap->bitmapLength -= 8;
 		}
 	}