--- CBOR-XS/XS.xs	2016/11/25 11:33:03	1.56
+++ CBOR-XS/XS.xs	2016/11/25 12:16:12	1.57
@@ -667,7 +667,7 @@
 
 #define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
 
-#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
+#define WANT(len) if (ecb_expect_false ((UV)(dec->end - dec->cur) < (UV)len)) ERR ("unexpected end of CBOR data")
 
 #define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
 #define DEC_DEC_DEPTH --dec->depth
@@ -756,7 +756,7 @@
     }
   else
     {
-      int i, len = decode_uint (dec);
+      UV i, len = decode_uint (dec);
 
       WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
       av_fill (av, len - 1);
@@ -846,7 +846,9 @@
     }
   else
     {
-      int pairs = decode_uint (dec);
+      UV pairs = decode_uint (dec);
+
+      WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
 
       while (pairs--)
         decode_he (dec, hv);