… | |
… | |
100 | #define F_SHRINK 0x00000001UL |
100 | #define F_SHRINK 0x00000001UL |
101 | #define F_ALLOW_UNKNOWN 0x00000002UL |
101 | #define F_ALLOW_UNKNOWN 0x00000002UL |
102 | #define F_ALLOW_SHARING 0x00000004UL |
102 | #define F_ALLOW_SHARING 0x00000004UL |
103 | #define F_ALLOW_CYCLES 0x00000008UL |
103 | #define F_ALLOW_CYCLES 0x00000008UL |
104 | #define F_PACK_STRINGS 0x00000010UL |
104 | #define F_PACK_STRINGS 0x00000010UL |
|
|
105 | #define F_UTF8_STRINGS 0x00000020UL |
105 | #define F_VALIDATE_UTF8 0x00000020UL |
106 | #define F_VALIDATE_UTF8 0x00000040UL |
106 | |
107 | |
107 | #define INIT_SIZE 32 // initial scalar size to be allocated |
108 | #define INIT_SIZE 32 // initial scalar size to be allocated |
108 | |
109 | |
109 | #define SB do { |
110 | #define SB do { |
110 | #define SE } while (0) |
111 | #define SE } while (0) |
… | |
… | |
279 | } |
280 | } |
280 | |
281 | |
281 | ecb_inline void |
282 | ecb_inline void |
282 | encode_str (enc_t *enc, int utf8, char *str, STRLEN len) |
283 | encode_str (enc_t *enc, int utf8, char *str, STRLEN len) |
283 | { |
284 | { |
|
|
285 | if (ecb_expect_false (enc->cbor.flags & F_UTF8_STRINGS)) |
|
|
286 | if (!utf8) |
|
|
287 | { |
|
|
288 | SV *sv = sv_newmortal (); |
|
|
289 | char *s; STRLEN l; |
|
|
290 | |
|
|
291 | sv_setpvn (sv, str, len); |
|
|
292 | |
|
|
293 | s = SvPVutf8 (sv, l); |
|
|
294 | encode_str (enc, 1, s, l); |
|
|
295 | return; |
|
|
296 | } |
|
|
297 | |
284 | encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); |
298 | encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); |
285 | need (enc, len); |
299 | need (enc, len); |
286 | memcpy (enc->cur, str, len); |
300 | memcpy (enc->cur, str, len); |
287 | enc->cur += len; |
301 | enc->cur += len; |
288 | } |
302 | } |
… | |
… | |
332 | SV **svp = av_fetch (av, i, 0); |
346 | SV **svp = av_fetch (av, i, 0); |
333 | encode_sv (enc, svp ? *svp : &PL_sv_undef); |
347 | encode_sv (enc, svp ? *svp : &PL_sv_undef); |
334 | } |
348 | } |
335 | else |
349 | else |
336 | for (i = 0; i <= len; ++i) |
350 | for (i = 0; i <= len; ++i) |
337 | encode_sv (enc, AvARRAY (av)[i]); |
351 | { |
|
|
352 | SV *sv = AvARRAY (av)[i]; |
|
|
353 | encode_sv (enc, sv ? sv : &PL_sv_undef); |
|
|
354 | } |
338 | |
355 | |
339 | --enc->depth; |
356 | --enc->depth; |
340 | } |
357 | } |
341 | |
358 | |
342 | static void |
359 | static void |
… | |
… | |
446 | |
463 | |
447 | if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) |
464 | if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) |
448 | { |
465 | { |
449 | dSP; |
466 | dSP; |
450 | |
467 | |
451 | ENTER; SAVETMPS; PUSHMARK (SP); |
468 | ENTER; SAVETMPS; |
|
|
469 | PUSHMARK (SP); |
452 | // we re-bless the reference to get overload and other niceties right |
470 | // we re-bless the reference to get overload and other niceties right |
453 | XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
471 | XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
454 | |
472 | |
455 | PUTBACK; |
473 | PUTBACK; |
456 | // G_SCALAR ensures that return value is 1 |
474 | // G_SCALAR ensures that return value is 1 |
… | |
… | |
469 | } |
487 | } |
470 | else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) |
488 | else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) |
471 | { |
489 | { |
472 | dSP; |
490 | dSP; |
473 | |
491 | |
474 | ENTER; SAVETMPS; PUSHMARK (SP); |
492 | ENTER; SAVETMPS; |
|
|
493 | SAVESTACK_POS (); |
|
|
494 | PUSHMARK (SP); |
475 | EXTEND (SP, 2); |
495 | EXTEND (SP, 2); |
476 | // we re-bless the reference to get overload and other niceties right |
496 | // we re-bless the reference to get overload and other niceties right |
477 | PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
497 | PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
478 | PUSHs (sv_cbor); |
498 | PUSHs (sv_cbor); |
479 | |
499 | |
… | |
… | |
581 | } |
601 | } |
582 | |
602 | |
583 | static SV * |
603 | static SV * |
584 | encode_cbor (SV *scalar, CBOR *cbor) |
604 | encode_cbor (SV *scalar, CBOR *cbor) |
585 | { |
605 | { |
586 | enc_t enc = { }; |
606 | enc_t enc = { 0 }; |
587 | |
607 | |
588 | enc.cbor = *cbor; |
608 | enc.cbor = *cbor; |
589 | enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); |
609 | enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); |
590 | enc.cur = SvPVX (enc.sv); |
610 | enc.cur = SvPVX (enc.sv); |
591 | enc.end = SvEND (enc.sv); |
611 | enc.end = SvEND (enc.sv); |
… | |
… | |
746 | if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) |
766 | if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) |
747 | { |
767 | { |
748 | I32 len = decode_uint (dec); |
768 | I32 len = decode_uint (dec); |
749 | char *key = (char *)dec->cur; |
769 | char *key = (char *)dec->cur; |
750 | |
770 | |
|
|
771 | WANT (len); |
751 | dec->cur += len; |
772 | dec->cur += len; |
752 | |
773 | |
753 | hv_store (hv, key, len, decode_sv (dec), 0); |
774 | hv_store (hv, key, len, decode_sv (dec), 0); |
754 | |
775 | |
755 | return; |
776 | return; |
756 | } |
777 | } |
757 | else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) |
778 | else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) |
758 | { |
779 | { |
759 | I32 len = decode_uint (dec); |
780 | I32 len = decode_uint (dec); |
760 | char *key = (char *)dec->cur; |
781 | char *key = (char *)dec->cur; |
761 | |
782 | |
|
|
783 | WANT (len); |
762 | dec->cur += len; |
784 | dec->cur += len; |
763 | |
785 | |
764 | if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) |
786 | if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) |
765 | if (!is_utf8_string (key, len)) |
787 | if (!is_utf8_string (key, len)) |
766 | ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); |
788 | ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); |
… | |
… | |
989 | if (!method) |
1011 | if (!method) |
990 | ERR ("cannot decode perl-object (package does not have a THAW method)"); |
1012 | ERR ("cannot decode perl-object (package does not have a THAW method)"); |
991 | |
1013 | |
992 | dSP; |
1014 | dSP; |
993 | |
1015 | |
994 | ENTER; SAVETMPS; PUSHMARK (SP); |
1016 | ENTER; SAVETMPS; |
|
|
1017 | PUSHMARK (SP); |
995 | EXTEND (SP, len + 1); |
1018 | EXTEND (SP, len + 1); |
996 | // we re-bless the reference to get overload and other niceties right |
1019 | // we re-bless the reference to get overload and other niceties right |
997 | PUSHs (*av_fetch (av, 0, 1)); |
1020 | PUSHs (*av_fetch (av, 0, 1)); |
998 | PUSHs (sv_cbor); |
1021 | PUSHs (sv_cbor); |
999 | |
1022 | |
… | |
… | |
1024 | default: |
1047 | default: |
1025 | { |
1048 | { |
1026 | sv = decode_sv (dec); |
1049 | sv = decode_sv (dec); |
1027 | |
1050 | |
1028 | dSP; |
1051 | dSP; |
1029 | ENTER; SAVETMPS; PUSHMARK (SP); |
1052 | ENTER; SAVETMPS; |
|
|
1053 | SAVESTACK_POS (); |
|
|
1054 | PUSHMARK (SP); |
1030 | EXTEND (SP, 2); |
1055 | EXTEND (SP, 2); |
1031 | PUSHs (newSVuv (tag)); |
1056 | PUSHs (newSVuv (tag)); |
1032 | PUSHs (sv); |
1057 | PUSHs (sv); |
1033 | |
1058 | |
1034 | PUTBACK; |
1059 | PUTBACK; |
… | |
… | |
1160 | } |
1185 | } |
1161 | |
1186 | |
1162 | static SV * |
1187 | static SV * |
1163 | decode_cbor (SV *string, CBOR *cbor, char **offset_return) |
1188 | decode_cbor (SV *string, CBOR *cbor, char **offset_return) |
1164 | { |
1189 | { |
1165 | dec_t dec = { }; |
1190 | dec_t dec = { 0 }; |
1166 | SV *sv; |
1191 | SV *sv; |
1167 | STRLEN len; |
1192 | STRLEN len; |
1168 | char *data = SvPVbyte (string, len); |
1193 | char *data = SvPVbyte (string, len); |
1169 | |
1194 | |
1170 | if (len > cbor->max_size && cbor->max_size) |
1195 | if (len > cbor->max_size && cbor->max_size) |
… | |
… | |
1261 | |
1286 | |
1262 | int major = *p >> MAJOR_SHIFT; |
1287 | int major = *p >> MAJOR_SHIFT; |
1263 | |
1288 | |
1264 | switch (major) |
1289 | switch (major) |
1265 | { |
1290 | { |
|
|
1291 | case MAJOR_TAG >> MAJOR_SHIFT: |
|
|
1292 | ++count; // tags merely prefix another value |
|
|
1293 | break; |
|
|
1294 | |
1266 | case MAJOR_BYTES >> MAJOR_SHIFT: |
1295 | case MAJOR_BYTES >> MAJOR_SHIFT: |
1267 | case MAJOR_TEXT >> MAJOR_SHIFT: |
1296 | case MAJOR_TEXT >> MAJOR_SHIFT: |
1268 | case MAJOR_ARRAY >> MAJOR_SHIFT: |
1297 | case MAJOR_ARRAY >> MAJOR_SHIFT: |
1269 | case MAJOR_MAP >> MAJOR_SHIFT: |
1298 | case MAJOR_MAP >> MAJOR_SHIFT: |
1270 | { |
1299 | { |
… | |
… | |
1375 | shrink = F_SHRINK |
1404 | shrink = F_SHRINK |
1376 | allow_unknown = F_ALLOW_UNKNOWN |
1405 | allow_unknown = F_ALLOW_UNKNOWN |
1377 | allow_sharing = F_ALLOW_SHARING |
1406 | allow_sharing = F_ALLOW_SHARING |
1378 | allow_cycles = F_ALLOW_CYCLES |
1407 | allow_cycles = F_ALLOW_CYCLES |
1379 | pack_strings = F_PACK_STRINGS |
1408 | pack_strings = F_PACK_STRINGS |
|
|
1409 | utf8_strings = F_UTF8_STRINGS |
1380 | validate_utf8 = F_VALIDATE_UTF8 |
1410 | validate_utf8 = F_VALIDATE_UTF8 |
1381 | PPCODE: |
1411 | PPCODE: |
1382 | { |
1412 | { |
1383 | if (enable) |
1413 | if (enable) |
1384 | self->flags |= ix; |
1414 | self->flags |= ix; |