--- CBOR-XS/XS.xs	2016/11/25 06:13:16	1.55
+++ CBOR-XS/XS.xs	2016/11/25 11:33:03	1.56
@@ -669,7 +669,7 @@
 
 #define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
 
-#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED)
+#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
 #define DEC_DEC_DEPTH --dec->depth
 
 static UV
@@ -783,7 +783,7 @@
   if (ecb_expect_true (!dec->stringref))
     if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
       {
-        I32 len = decode_uint (dec);
+        STRLEN len = decode_uint (dec);
         char *key = (char *)dec->cur;
 
         WANT (len);
@@ -795,7 +795,7 @@
       }
     else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
       {
-        I32 len = decode_uint (dec);
+        STRLEN len = decode_uint (dec);
         char *key = (char *)dec->cur;
 
         WANT (len);
@@ -1396,6 +1396,8 @@
 
         sv_cbor = newSVpv ("CBOR", 0);
         SvREADONLY_on (sv_cbor);
+
+        assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
 }
 
 PROTOTYPES: DISABLE