--- CBOR-XS/XS.xs	2014/01/05 14:24:54	1.43
+++ CBOR-XS/XS.xs	2016/02/08 04:11:11	1.49
@@ -9,6 +9,7 @@
 #include <limits.h>
 #include <float.h>
 
+#define ECB_NO_THREADS 1
 #include "ecb.h"
 
 // compatibility with perl <5.18
@@ -325,11 +326,18 @@
 
   encode_uint (enc, MAJOR_ARRAY, len + 1);
 
-  for (i = 0; i <= len; ++i)
-    {
-      SV **svp = av_fetch (av, i, 0);
-      encode_sv (enc, svp ? *svp : &PL_sv_undef);
-    }
+  if (SvMAGICAL (av))
+    for (i = 0; i <= len; ++i)
+      {
+        SV **svp = av_fetch (av, i, 0);
+        encode_sv (enc, svp ? *svp : &PL_sv_undef);
+      }
+  else
+    for (i = 0; i <= len; ++i)
+      {
+        SV *sv = AvARRAY (av)[i];
+        encode_sv (enc, sv ? sv : &PL_sv_undef);
+      }
 
   --enc->depth;
 }
@@ -578,7 +586,7 @@
 static SV *
 encode_cbor (SV *scalar, CBOR *cbor)
 {
-  enc_t enc = { };
+  enc_t enc = { 0 };
 
   enc.cbor      = *cbor;
   enc.sv        = sv_2mortal (NEWSV (0, INIT_SIZE));
@@ -743,9 +751,10 @@
         I32 len = decode_uint (dec);
         char *key = (char *)dec->cur;
 
+        WANT (len);
         dec->cur += len;
 
-        hv_store (hv, key,  len, decode_sv (dec), 0);
+        hv_store (hv, key, len, decode_sv (dec), 0);
 
         return;
       }
@@ -754,6 +763,7 @@
         I32 len = decode_uint (dec);
         char *key = (char *)dec->cur;
 
+        WANT (len);
         dec->cur += len;
 
         if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
@@ -1157,7 +1167,7 @@
 static SV *
 decode_cbor (SV *string, CBOR *cbor, char **offset_return)
 {
-  dec_t dec = { };
+  dec_t dec = { 0 };
   SV *sv;
   STRLEN len;
   char *data = SvPVbyte (string, len);
@@ -1258,6 +1268,10 @@
 
           switch (major)
             {
+              case MAJOR_TAG     >> MAJOR_SHIFT:
+                ++count; // tags merely prefix another value
+                break;
+
               case MAJOR_BYTES   >> MAJOR_SHIFT:
               case MAJOR_TEXT    >> MAJOR_SHIFT:
               case MAJOR_ARRAY   >> MAJOR_SHIFT: