ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CBOR-XS/XS.xs
(Generate patch)

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.70 by root, Fri Dec 4 02:57:14 2020 UTC vs.
Revision 1.72 by root, Thu Oct 21 01:14:58 2021 UTC

… …
28#endif 28#endif
29#ifndef SvREFCNT_dec_NN 29#ifndef SvREFCNT_dec_NN
30# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv) 30# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
31#endif 31#endif
32 32
33// perl's is_utf8_string interprets len=0 as "calculate len", but we want it to mean 0
34#define cbor_is_utf8_string(str,len) (!(len) || is_utf8_string ((str), (len)))
35
33// known major and minor types 36// known major and minor types
34enum cbor_type 37enum cbor_type
35{ 38{
36 MAJOR_SHIFT = 5, 39 MAJOR_SHIFT = 5,
37 MINOR_MASK = 0x1f, 40 MINOR_MASK = 0x1f,
… …
201#endif 204#endif
202 } 205 }
203} 206}
204 207
205// minimum length of a string to be registered for stringref 208// minimum length of a string to be registered for stringref
206ecb_inline int 209ecb_inline STRLEN
207minimum_string_length (UV idx) 210minimum_string_length (UV idx)
208{ 211{
209 return idx <= 23 ? 3 212 return idx <= 23 ? 3
210 : idx <= 0xffU ? 4 213 : idx <= 0xffU ? 4
211 : idx <= 0xffffU ? 5 214 : idx <= 0xffffU ? 5
… …
982 } 985 }
983 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 986 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
984 { 987 {
985 STRLEN len = decode_uint (dec); 988 STRLEN len = decode_uint (dec);
986 char *key = (char *)dec->cur; 989 char *key = (char *)dec->cur;
990 printf ("len %d\n", len);//D
987 991
988 WANT (len); 992 WANT (len);
989 dec->cur += len; 993 dec->cur += len;
990 994
991 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 995 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
992 if (!is_utf8_string (key, len)) 996 if (!cbor_is_utf8_string ((U8 *)key, len))
993 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 997 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
994 998
995 hv_store (hv, key, -len, decode_sv (dec), 0); 999 hv_store (hv, key, -len, decode_sv (dec), 0);
996 1000
997 return; 1001 return;
… …
1126 } 1130 }
1127 1131
1128 if (utf8) 1132 if (utf8)
1129 { 1133 {
1130 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 1134 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
1131 if (!is_utf8_string (SvPVX (sv), SvCUR (sv))) 1135 if (!cbor_is_utf8_string (SvPVX (sv), SvCUR (sv)))
1132 ERR ("corrupted CBOR data (invalid UTF-8 in text string)"); 1136 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
1133 1137
1134 SvUTF8_on (sv); 1138 SvUTF8_on (sv);
1135 } 1139 }
1136 1140
… …
1569 1573
1570 break; 1574 break;
1571 1575
1572 case MAJOR_MAP >> MAJOR_SHIFT: 1576 case MAJOR_MAP >> MAJOR_SHIFT:
1573 len <<= 1; 1577 len <<= 1;
1578 /* FALLTHROUGH */
1574 case MAJOR_ARRAY >> MAJOR_SHIFT: 1579 case MAJOR_ARRAY >> MAJOR_SHIFT:
1575 if (len) 1580 if (len)
1576 { 1581 {
1577 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest 1582 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1578 count = len + 1; 1583 count = len + 1;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines