… | |
… | |
99 | |
99 | |
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_FORBID_OBJECTS 0x00000010UL |
104 | #define F_PACK_STRINGS 0x00000010UL |
105 | #define F_PACK_STRINGS 0x00000020UL |
|
|
106 | #define F_TEXT_KEYS 0x00000040UL |
|
|
107 | #define F_TEXT_STRINGS 0x00000080UL |
105 | #define F_VALIDATE_UTF8 0x00000020UL |
108 | #define F_VALIDATE_UTF8 0x00000100UL |
106 | |
109 | |
107 | #define INIT_SIZE 32 // initial scalar size to be allocated |
110 | #define INIT_SIZE 32 // initial scalar size to be allocated |
108 | |
111 | |
109 | #define SB do { |
112 | #define SB do { |
110 | #define SE } while (0) |
113 | #define SE } while (0) |
… | |
… | |
276 | encode_tag (enc_t *enc, UV tag) |
279 | encode_tag (enc_t *enc, UV tag) |
277 | { |
280 | { |
278 | encode_uint (enc, MAJOR_TAG, tag); |
281 | encode_uint (enc, MAJOR_TAG, tag); |
279 | } |
282 | } |
280 | |
283 | |
|
|
284 | // exceptional (hopefully) slow path for byte strings that need to be utf8-encoded |
|
|
285 | ecb_noinline static void |
|
|
286 | encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len) |
|
|
287 | { |
|
|
288 | STRLEN ulen = len; |
|
|
289 | U8 *p, *pend = (U8 *)str + len; |
|
|
290 | |
|
|
291 | for (p = (U8 *)str; p < pend; ++p) |
|
|
292 | ulen += *p >> 7; // count set high bits |
|
|
293 | |
|
|
294 | encode_uint (enc, MAJOR_TEXT, ulen); |
|
|
295 | |
|
|
296 | need (enc, ulen); |
|
|
297 | for (p = (U8 *)str; p < pend; ++p) |
|
|
298 | if (*p < 0x80) |
|
|
299 | *enc->cur++ = *p; |
|
|
300 | else |
|
|
301 | { |
|
|
302 | *enc->cur++ = 0xc0 + (*p >> 6); |
|
|
303 | *enc->cur++ = 0x80 + (*p & 63); |
|
|
304 | } |
|
|
305 | } |
|
|
306 | |
281 | ecb_inline void |
307 | ecb_inline void |
282 | encode_str (enc_t *enc, int utf8, char *str, STRLEN len) |
308 | encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len) |
283 | { |
309 | { |
|
|
310 | if (ecb_expect_false (upgrade_utf8)) |
|
|
311 | if (!utf8) |
|
|
312 | { |
|
|
313 | encode_str_utf8 (enc, utf8, str, len); |
|
|
314 | return; |
|
|
315 | } |
|
|
316 | |
284 | encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); |
317 | encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); |
285 | need (enc, len); |
318 | need (enc, len); |
286 | memcpy (enc->cur, str, len); |
319 | memcpy (enc->cur, str, len); |
287 | enc->cur += len; |
320 | enc->cur += len; |
288 | } |
321 | } |
289 | |
322 | |
290 | static void |
323 | ecb_inline void |
291 | encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) |
324 | encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len) |
292 | { |
325 | { |
293 | if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) |
326 | if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) |
294 | { |
327 | { |
295 | SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); |
328 | SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); |
296 | |
329 | |
… | |
… | |
307 | sv_setuv (*svp, enc->stringref_idx); |
340 | sv_setuv (*svp, enc->stringref_idx); |
308 | ++enc->stringref_idx; |
341 | ++enc->stringref_idx; |
309 | } |
342 | } |
310 | } |
343 | } |
311 | |
344 | |
312 | encode_str (enc, utf8, str, len); |
345 | encode_str (enc, upgrade_utf8, utf8, str, len); |
313 | } |
346 | } |
314 | |
347 | |
315 | static void encode_sv (enc_t *enc, SV *sv); |
348 | static void encode_sv (enc_t *enc, SV *sv); |
316 | |
349 | |
317 | static void |
350 | static void |
… | |
… | |
332 | SV **svp = av_fetch (av, i, 0); |
365 | SV **svp = av_fetch (av, i, 0); |
333 | encode_sv (enc, svp ? *svp : &PL_sv_undef); |
366 | encode_sv (enc, svp ? *svp : &PL_sv_undef); |
334 | } |
367 | } |
335 | else |
368 | else |
336 | for (i = 0; i <= len; ++i) |
369 | for (i = 0; i <= len; ++i) |
337 | encode_sv (enc, AvARRAY (av)[i]); |
370 | { |
|
|
371 | SV *sv = AvARRAY (av)[i]; |
|
|
372 | encode_sv (enc, sv ? sv : &PL_sv_undef); |
|
|
373 | } |
338 | |
374 | |
339 | --enc->depth; |
375 | --enc->depth; |
340 | } |
376 | } |
341 | |
377 | |
342 | static void |
378 | static void |
… | |
… | |
360 | while ((he = hv_iternext (hv))) |
396 | while ((he = hv_iternext (hv))) |
361 | { |
397 | { |
362 | if (HeKLEN (he) == HEf_SVKEY) |
398 | if (HeKLEN (he) == HEf_SVKEY) |
363 | encode_sv (enc, HeSVKEY (he)); |
399 | encode_sv (enc, HeSVKEY (he)); |
364 | else |
400 | else |
365 | encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); |
401 | encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he)); |
366 | |
402 | |
367 | encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); |
403 | encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); |
368 | } |
404 | } |
369 | |
405 | |
370 | if (mg) |
406 | if (mg) |
… | |
… | |
442 | if (ecb_expect_false (SvOBJECT (sv))) |
478 | if (ecb_expect_false (SvOBJECT (sv))) |
443 | { |
479 | { |
444 | HV *stash = SvSTASH (sv); |
480 | HV *stash = SvSTASH (sv); |
445 | GV *method; |
481 | GV *method; |
446 | |
482 | |
|
|
483 | if (enc->cbor.flags & F_FORBID_OBJECTS) |
|
|
484 | croak ("encountered object '%s', but forbid_objects is enabled", |
|
|
485 | SvPV_nolen (sv_2mortal (newRV_inc (sv)))); |
447 | if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) |
486 | else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) |
448 | { |
487 | { |
449 | dSP; |
488 | dSP; |
450 | |
489 | |
451 | ENTER; SAVETMPS; PUSHMARK (SP); |
490 | ENTER; SAVETMPS; |
|
|
491 | PUSHMARK (SP); |
452 | // we re-bless the reference to get overload and other niceties right |
492 | // we re-bless the reference to get overload and other niceties right |
453 | XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
493 | XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
454 | |
494 | |
455 | PUTBACK; |
495 | PUTBACK; |
456 | // G_SCALAR ensures that return value is 1 |
496 | // G_SCALAR ensures that return value is 1 |
… | |
… | |
469 | } |
509 | } |
470 | else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) |
510 | else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) |
471 | { |
511 | { |
472 | dSP; |
512 | dSP; |
473 | |
513 | |
474 | ENTER; SAVETMPS; PUSHMARK (SP); |
514 | ENTER; SAVETMPS; |
|
|
515 | SAVESTACK_POS (); |
|
|
516 | PUSHMARK (SP); |
475 | EXTEND (SP, 2); |
517 | EXTEND (SP, 2); |
476 | // we re-bless the reference to get overload and other niceties right |
518 | // we re-bless the reference to get overload and other niceties right |
477 | PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
519 | PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
478 | PUSHs (sv_cbor); |
520 | PUSHs (sv_cbor); |
479 | |
521 | |
… | |
… | |
485 | if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) |
527 | if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) |
486 | croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); |
528 | croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); |
487 | |
529 | |
488 | encode_tag (enc, CBOR_TAG_PERL_OBJECT); |
530 | encode_tag (enc, CBOR_TAG_PERL_OBJECT); |
489 | encode_uint (enc, MAJOR_ARRAY, count + 1); |
531 | encode_uint (enc, MAJOR_ARRAY, count + 1); |
490 | encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); |
532 | encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); |
491 | |
533 | |
492 | while (count) |
534 | while (count) |
493 | encode_sv (enc, SP[1 - count--]); |
535 | encode_sv (enc, SP[1 - count--]); |
494 | |
536 | |
495 | PUTBACK; |
537 | PUTBACK; |
… | |
… | |
554 | |
596 | |
555 | if (SvPOKp (sv)) |
597 | if (SvPOKp (sv)) |
556 | { |
598 | { |
557 | STRLEN len; |
599 | STRLEN len; |
558 | char *str = SvPV (sv, len); |
600 | char *str = SvPV (sv, len); |
559 | encode_strref (enc, SvUTF8 (sv), str, len); |
601 | encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len); |
560 | } |
602 | } |
561 | else if (SvNOKp (sv)) |
603 | else if (SvNOKp (sv)) |
562 | encode_nv (enc, sv); |
604 | encode_nv (enc, sv); |
563 | else if (SvIOKp (sv)) |
605 | else if (SvIOKp (sv)) |
564 | { |
606 | { |
… | |
… | |
581 | } |
623 | } |
582 | |
624 | |
583 | static SV * |
625 | static SV * |
584 | encode_cbor (SV *scalar, CBOR *cbor) |
626 | encode_cbor (SV *scalar, CBOR *cbor) |
585 | { |
627 | { |
586 | enc_t enc = { }; |
628 | enc_t enc = { 0 }; |
587 | |
629 | |
588 | enc.cbor = *cbor; |
630 | enc.cbor = *cbor; |
589 | enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); |
631 | enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); |
590 | enc.cur = SvPVX (enc.sv); |
632 | enc.cur = SvPVX (enc.sv); |
591 | enc.end = SvEND (enc.sv); |
633 | enc.end = SvEND (enc.sv); |
… | |
… | |
623 | U32 depth; // recursion depth |
665 | U32 depth; // recursion depth |
624 | U32 maxdepth; // recursion depth limit |
666 | U32 maxdepth; // recursion depth limit |
625 | AV *shareable; |
667 | AV *shareable; |
626 | AV *stringref; |
668 | AV *stringref; |
627 | SV *decode_tagged; |
669 | SV *decode_tagged; |
|
|
670 | SV *err_sv; // optional sv for error, needs to be freed |
628 | } dec_t; |
671 | } dec_t; |
629 | |
672 | |
630 | #define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE |
673 | // set dec->err to ERRSV |
|
|
674 | ecb_cold static void |
|
|
675 | err_errsv (dec_t *dec) |
|
|
676 | { |
|
|
677 | if (!dec->err) |
|
|
678 | { |
|
|
679 | dec->err_sv = newSVsv (ERRSV); |
631 | |
680 | |
632 | #define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") |
681 | // chop off the trailing \n |
|
|
682 | SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1); |
|
|
683 | *SvEND (dec->err_sv) = 0; |
633 | |
684 | |
|
|
685 | dec->err = SvPVutf8_nolen (dec->err_sv); |
|
|
686 | } |
|
|
687 | } |
|
|
688 | |
|
|
689 | // the following functions are used to reduce code size and help the compiler to optimise |
|
|
690 | ecb_cold static void |
|
|
691 | err_set (dec_t *dec, const char *reason) |
|
|
692 | { |
|
|
693 | if (!dec->err) |
|
|
694 | dec->err = reason; |
|
|
695 | } |
|
|
696 | |
|
|
697 | ecb_cold static void |
|
|
698 | err_unexpected_end (dec_t *dec) |
|
|
699 | { |
|
|
700 | err_set (dec, "unexpected end of CBOR data"); |
|
|
701 | } |
|
|
702 | |
|
|
703 | ecb_cold static void |
|
|
704 | err_nesting_exceeded (dec_t *dec) |
|
|
705 | { |
|
|
706 | err_set (dec, ERR_NESTING_EXCEEDED); |
|
|
707 | } |
|
|
708 | |
|
|
709 | #define ERR_DO(do) SB do; goto fail; SE |
|
|
710 | #define ERR(reason) ERR_DO (err_set (dec, reason)) |
|
|
711 | #define ERR_ERRSV ERR_DO (err_errsv (dec)) |
|
|
712 | |
|
|
713 | #define WANT(len) if (ecb_expect_false ((UV)(dec->end - dec->cur) < (UV)len)) ERR_DO (err_unexpected_end (dec)) |
|
|
714 | |
634 | #define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) |
715 | #define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED) |
635 | #define DEC_DEC_DEPTH --dec->depth |
716 | #define DEC_DEC_DEPTH --dec->depth |
636 | |
717 | |
637 | static UV |
718 | static UV |
638 | decode_uint (dec_t *dec) |
719 | decode_uint (dec_t *dec) |
639 | { |
720 | { |
… | |
… | |
716 | av_push (av, decode_sv (dec)); |
797 | av_push (av, decode_sv (dec)); |
717 | } |
798 | } |
718 | } |
799 | } |
719 | else |
800 | else |
720 | { |
801 | { |
721 | int i, len = decode_uint (dec); |
802 | UV i, len = decode_uint (dec); |
722 | |
803 | |
723 | WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays |
804 | WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays |
724 | av_fill (av, len - 1); |
805 | av_fill (av, len - 1); |
725 | |
806 | |
726 | for (i = 0; i < len; ++i) |
807 | for (i = 0; i < len; ++i) |
… | |
… | |
743 | // byte or utf-8 strings as keys, but only when !stringref |
824 | // byte or utf-8 strings as keys, but only when !stringref |
744 | |
825 | |
745 | if (ecb_expect_true (!dec->stringref)) |
826 | if (ecb_expect_true (!dec->stringref)) |
746 | if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) |
827 | if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) |
747 | { |
828 | { |
748 | I32 len = decode_uint (dec); |
829 | STRLEN len = decode_uint (dec); |
749 | char *key = (char *)dec->cur; |
830 | char *key = (char *)dec->cur; |
750 | |
831 | |
|
|
832 | WANT (len); |
751 | dec->cur += len; |
833 | dec->cur += len; |
752 | |
834 | |
753 | hv_store (hv, key, len, decode_sv (dec), 0); |
835 | hv_store (hv, key, len, decode_sv (dec), 0); |
754 | |
836 | |
755 | return; |
837 | return; |
756 | } |
838 | } |
757 | else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) |
839 | else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) |
758 | { |
840 | { |
759 | I32 len = decode_uint (dec); |
841 | STRLEN len = decode_uint (dec); |
760 | char *key = (char *)dec->cur; |
842 | char *key = (char *)dec->cur; |
761 | |
843 | |
|
|
844 | WANT (len); |
762 | dec->cur += len; |
845 | dec->cur += len; |
763 | |
846 | |
764 | if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) |
847 | if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) |
765 | if (!is_utf8_string (key, len)) |
848 | if (!is_utf8_string (key, len)) |
766 | ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); |
849 | ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); |
… | |
… | |
770 | return; |
853 | return; |
771 | } |
854 | } |
772 | |
855 | |
773 | SV *k = decode_sv (dec); |
856 | SV *k = decode_sv (dec); |
774 | SV *v = decode_sv (dec); |
857 | SV *v = decode_sv (dec); |
|
|
858 | |
|
|
859 | // we leak memory if uncaught exceptions are thrown by random magical |
|
|
860 | // methods, and this is hopefully the only place where it can happen, |
|
|
861 | // so if there is a chance of an exception, take the very slow path. |
|
|
862 | // since catching exceptions is "undocumented/internal/forbidden" by |
|
|
863 | // the new p5p powers, we need to call out to a perl function :/ |
|
|
864 | if (ecb_expect_false (SvAMAGIC (k))) |
|
|
865 | { |
|
|
866 | dSP; |
|
|
867 | |
|
|
868 | ENTER; SAVETMPS; |
|
|
869 | PUSHMARK (SP); |
|
|
870 | EXTEND (SP, 3); |
|
|
871 | PUSHs (sv_2mortal (newRV_inc ((SV *)hv))); |
|
|
872 | PUSHs (sv_2mortal (k)); |
|
|
873 | PUSHs (sv_2mortal (v)); |
|
|
874 | |
|
|
875 | PUTBACK; |
|
|
876 | call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL); |
|
|
877 | SPAGAIN; |
|
|
878 | |
|
|
879 | FREETMPS; LEAVE; |
|
|
880 | |
|
|
881 | if (SvTRUE (ERRSV)) |
|
|
882 | ERR_ERRSV; |
|
|
883 | |
|
|
884 | return; |
|
|
885 | } |
775 | |
886 | |
776 | hv_store_ent (hv, k, v, 0); |
887 | hv_store_ent (hv, k, v, 0); |
777 | SvREFCNT_dec (k); |
888 | SvREFCNT_dec (k); |
778 | |
889 | |
779 | fail: |
890 | fail: |
… | |
… | |
804 | decode_he (dec, hv); |
915 | decode_he (dec, hv); |
805 | } |
916 | } |
806 | } |
917 | } |
807 | else |
918 | else |
808 | { |
919 | { |
809 | int pairs = decode_uint (dec); |
920 | UV pairs = decode_uint (dec); |
|
|
921 | |
|
|
922 | WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes |
810 | |
923 | |
811 | while (pairs--) |
924 | while (pairs--) |
812 | decode_he (dec, hv); |
925 | decode_he (dec, hv); |
813 | } |
926 | } |
814 | |
927 | |
… | |
… | |
902 | sv = newRV_noinc (decode_sv (dec)); |
1015 | sv = newRV_noinc (decode_sv (dec)); |
903 | break; |
1016 | break; |
904 | |
1017 | |
905 | case CBOR_TAG_STRINGREF_NAMESPACE: |
1018 | case CBOR_TAG_STRINGREF_NAMESPACE: |
906 | { |
1019 | { |
|
|
1020 | // do nmot use SAVETMPS/FREETMPS, as these will |
|
|
1021 | // erase mortalised caches, e.g. "shareable" |
907 | ENTER; SAVETMPS; |
1022 | ENTER; |
908 | |
1023 | |
909 | SAVESPTR (dec->stringref); |
1024 | SAVESPTR (dec->stringref); |
910 | dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); |
1025 | dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); |
911 | |
1026 | |
912 | sv = decode_sv (dec); |
1027 | sv = decode_sv (dec); |
913 | |
1028 | |
914 | FREETMPS; LEAVE; |
1029 | LEAVE; |
915 | } |
1030 | } |
916 | break; |
1031 | break; |
917 | |
1032 | |
918 | case CBOR_TAG_STRINGREF: |
1033 | case CBOR_TAG_STRINGREF: |
919 | { |
1034 | { |
… | |
… | |
970 | } |
1085 | } |
971 | break; |
1086 | break; |
972 | |
1087 | |
973 | case CBOR_TAG_PERL_OBJECT: |
1088 | case CBOR_TAG_PERL_OBJECT: |
974 | { |
1089 | { |
|
|
1090 | if (dec->cbor.flags & F_FORBID_OBJECTS) |
|
|
1091 | goto filter; |
|
|
1092 | |
975 | sv = decode_sv (dec); |
1093 | sv = decode_sv (dec); |
976 | |
1094 | |
977 | if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) |
1095 | if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) |
978 | ERR ("corrupted CBOR data (non-array perl object)"); |
1096 | ERR ("corrupted CBOR data (non-array perl object)"); |
979 | |
1097 | |
… | |
… | |
989 | if (!method) |
1107 | if (!method) |
990 | ERR ("cannot decode perl-object (package does not have a THAW method)"); |
1108 | ERR ("cannot decode perl-object (package does not have a THAW method)"); |
991 | |
1109 | |
992 | dSP; |
1110 | dSP; |
993 | |
1111 | |
994 | ENTER; SAVETMPS; PUSHMARK (SP); |
1112 | ENTER; SAVETMPS; |
|
|
1113 | PUSHMARK (SP); |
995 | EXTEND (SP, len + 1); |
1114 | EXTEND (SP, len + 1); |
996 | // we re-bless the reference to get overload and other niceties right |
1115 | // we re-bless the reference to get overload and other niceties right |
997 | PUSHs (*av_fetch (av, 0, 1)); |
1116 | PUSHs (*av_fetch (av, 0, 1)); |
998 | PUSHs (sv_cbor); |
1117 | PUSHs (sv_cbor); |
999 | |
1118 | |
… | |
… | |
1007 | SPAGAIN; |
1126 | SPAGAIN; |
1008 | |
1127 | |
1009 | if (SvTRUE (ERRSV)) |
1128 | if (SvTRUE (ERRSV)) |
1010 | { |
1129 | { |
1011 | FREETMPS; LEAVE; |
1130 | FREETMPS; LEAVE; |
1012 | ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); |
1131 | ERR_ERRSV; |
1013 | } |
1132 | } |
1014 | |
1133 | |
1015 | SvREFCNT_dec (sv); |
1134 | SvREFCNT_dec (sv); |
1016 | sv = SvREFCNT_inc (POPs); |
1135 | sv = SvREFCNT_inc (POPs); |
1017 | |
1136 | |
… | |
… | |
1020 | FREETMPS; LEAVE; |
1139 | FREETMPS; LEAVE; |
1021 | } |
1140 | } |
1022 | break; |
1141 | break; |
1023 | |
1142 | |
1024 | default: |
1143 | default: |
|
|
1144 | filter: |
1025 | { |
1145 | { |
|
|
1146 | SV *tag_sv = newSVuv (tag); |
|
|
1147 | |
1026 | sv = decode_sv (dec); |
1148 | sv = decode_sv (dec); |
1027 | |
1149 | |
1028 | dSP; |
1150 | dSP; |
1029 | ENTER; SAVETMPS; PUSHMARK (SP); |
1151 | ENTER; SAVETMPS; |
|
|
1152 | SAVESTACK_POS (); |
|
|
1153 | PUSHMARK (SP); |
1030 | EXTEND (SP, 2); |
1154 | EXTEND (SP, 2); |
1031 | PUSHs (newSVuv (tag)); |
1155 | PUSHs (tag_sv); |
1032 | PUSHs (sv); |
1156 | PUSHs (sv); |
1033 | |
1157 | |
1034 | PUTBACK; |
1158 | PUTBACK; |
1035 | int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); |
1159 | int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); |
1036 | SPAGAIN; |
1160 | SPAGAIN; |
1037 | |
1161 | |
1038 | if (SvTRUE (ERRSV)) |
1162 | if (SvTRUE (ERRSV)) |
1039 | { |
1163 | { |
|
|
1164 | SvREFCNT_dec (tag_sv); |
1040 | FREETMPS; LEAVE; |
1165 | FREETMPS; LEAVE; |
1041 | ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); |
1166 | ERR_ERRSV; |
1042 | } |
1167 | } |
1043 | |
1168 | |
1044 | if (count) |
1169 | if (count) |
1045 | { |
1170 | { |
|
|
1171 | SvREFCNT_dec (tag_sv); |
1046 | SvREFCNT_dec (sv); |
1172 | SvREFCNT_dec (sv); |
1047 | sv = SvREFCNT_inc (POPs); |
1173 | sv = SvREFCNT_inc (POPs); |
1048 | } |
1174 | } |
1049 | else |
1175 | else |
1050 | { |
1176 | { |
1051 | AV *av = newAV (); |
1177 | AV *av = newAV (); |
1052 | av_push (av, newSVuv (tag)); |
1178 | av_push (av, tag_sv); |
1053 | av_push (av, sv); |
1179 | av_push (av, sv); |
1054 | |
1180 | |
1055 | HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash |
1181 | HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash |
1056 | ? cbor_tagged_stash |
1182 | ? cbor_tagged_stash |
1057 | : gv_stashpv ("CBOR::XS::Tagged" , 1); |
1183 | : gv_stashpv ("CBOR::XS::Tagged" , 1); |
… | |
… | |
1160 | } |
1286 | } |
1161 | |
1287 | |
1162 | static SV * |
1288 | static SV * |
1163 | decode_cbor (SV *string, CBOR *cbor, char **offset_return) |
1289 | decode_cbor (SV *string, CBOR *cbor, char **offset_return) |
1164 | { |
1290 | { |
1165 | dec_t dec = { }; |
1291 | dec_t dec = { 0 }; |
1166 | SV *sv; |
1292 | SV *sv; |
1167 | STRLEN len; |
1293 | STRLEN len; |
1168 | char *data = SvPVbyte (string, len); |
1294 | char *data = SvPVbyte (string, len); |
1169 | |
1295 | |
1170 | if (len > cbor->max_size && cbor->max_size) |
1296 | if (len > cbor->max_size && cbor->max_size) |
… | |
… | |
1186 | |
1312 | |
1187 | if (dec.err) |
1313 | if (dec.err) |
1188 | { |
1314 | { |
1189 | if (dec.shareable) |
1315 | if (dec.shareable) |
1190 | { |
1316 | { |
1191 | // need to break cyclic links, which whould all be in shareable |
1317 | // need to break cyclic links, which would all be in shareable |
1192 | int i; |
1318 | int i; |
1193 | SV **svp; |
1319 | SV **svp; |
1194 | |
1320 | |
1195 | for (i = av_len (dec.shareable) + 1; i--; ) |
1321 | for (i = av_len (dec.shareable) + 1; i--; ) |
1196 | if ((svp = av_fetch (dec.shareable, i, 0))) |
1322 | if ((svp = av_fetch (dec.shareable, i, 0))) |
1197 | sv_setsv (*svp, &PL_sv_undef); |
1323 | sv_setsv (*svp, &PL_sv_undef); |
1198 | } |
1324 | } |
1199 | |
1325 | |
1200 | SvREFCNT_dec (sv); |
1326 | SvREFCNT_dec (sv); |
|
|
1327 | |
|
|
1328 | if (dec.err_sv) |
|
|
1329 | sv_2mortal (dec.err_sv); |
|
|
1330 | |
1201 | croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); |
1331 | croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); |
1202 | } |
1332 | } |
1203 | |
1333 | |
1204 | sv = sv_2mortal (sv); |
1334 | sv = sv_2mortal (sv); |
1205 | |
1335 | |
… | |
… | |
1261 | |
1391 | |
1262 | int major = *p >> MAJOR_SHIFT; |
1392 | int major = *p >> MAJOR_SHIFT; |
1263 | |
1393 | |
1264 | switch (major) |
1394 | switch (major) |
1265 | { |
1395 | { |
|
|
1396 | case MAJOR_TAG >> MAJOR_SHIFT: |
|
|
1397 | ++count; // tags merely prefix another value |
|
|
1398 | break; |
|
|
1399 | |
1266 | case MAJOR_BYTES >> MAJOR_SHIFT: |
1400 | case MAJOR_BYTES >> MAJOR_SHIFT: |
1267 | case MAJOR_TEXT >> MAJOR_SHIFT: |
1401 | case MAJOR_TEXT >> MAJOR_SHIFT: |
1268 | case MAJOR_ARRAY >> MAJOR_SHIFT: |
1402 | case MAJOR_ARRAY >> MAJOR_SHIFT: |
1269 | case MAJOR_MAP >> MAJOR_SHIFT: |
1403 | case MAJOR_MAP >> MAJOR_SHIFT: |
1270 | { |
1404 | { |
… | |
… | |
1345 | |
1479 | |
1346 | default_filter = newSVpv ("CBOR::XS::default_filter", 0); |
1480 | default_filter = newSVpv ("CBOR::XS::default_filter", 0); |
1347 | |
1481 | |
1348 | sv_cbor = newSVpv ("CBOR", 0); |
1482 | sv_cbor = newSVpv ("CBOR", 0); |
1349 | SvREADONLY_on (sv_cbor); |
1483 | SvREADONLY_on (sv_cbor); |
|
|
1484 | |
|
|
1485 | assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1)); |
1350 | } |
1486 | } |
1351 | |
1487 | |
1352 | PROTOTYPES: DISABLE |
1488 | PROTOTYPES: DISABLE |
1353 | |
1489 | |
1354 | void CLONE (...) |
1490 | void CLONE (...) |
… | |
… | |
1374 | ALIAS: |
1510 | ALIAS: |
1375 | shrink = F_SHRINK |
1511 | shrink = F_SHRINK |
1376 | allow_unknown = F_ALLOW_UNKNOWN |
1512 | allow_unknown = F_ALLOW_UNKNOWN |
1377 | allow_sharing = F_ALLOW_SHARING |
1513 | allow_sharing = F_ALLOW_SHARING |
1378 | allow_cycles = F_ALLOW_CYCLES |
1514 | allow_cycles = F_ALLOW_CYCLES |
|
|
1515 | forbid_objects = F_FORBID_OBJECTS |
1379 | pack_strings = F_PACK_STRINGS |
1516 | pack_strings = F_PACK_STRINGS |
|
|
1517 | text_keys = F_TEXT_KEYS |
|
|
1518 | text_strings = F_TEXT_STRINGS |
1380 | validate_utf8 = F_VALIDATE_UTF8 |
1519 | validate_utf8 = F_VALIDATE_UTF8 |
1381 | PPCODE: |
1520 | PPCODE: |
1382 | { |
1521 | { |
1383 | if (enable) |
1522 | if (enable) |
1384 | self->flags |= ix; |
1523 | self->flags |= ix; |
… | |
… | |
1392 | ALIAS: |
1531 | ALIAS: |
1393 | get_shrink = F_SHRINK |
1532 | get_shrink = F_SHRINK |
1394 | get_allow_unknown = F_ALLOW_UNKNOWN |
1533 | get_allow_unknown = F_ALLOW_UNKNOWN |
1395 | get_allow_sharing = F_ALLOW_SHARING |
1534 | get_allow_sharing = F_ALLOW_SHARING |
1396 | get_allow_cycles = F_ALLOW_CYCLES |
1535 | get_allow_cycles = F_ALLOW_CYCLES |
|
|
1536 | get_forbid_objects = F_FORBID_OBJECTS |
1397 | get_pack_strings = F_PACK_STRINGS |
1537 | get_pack_strings = F_PACK_STRINGS |
|
|
1538 | get_text_keys = F_TEXT_KEYS |
|
|
1539 | get_text_strings = F_TEXT_STRINGS |
1398 | get_validate_utf8 = F_VALIDATE_UTF8 |
1540 | get_validate_utf8 = F_VALIDATE_UTF8 |
1399 | PPCODE: |
1541 | PPCODE: |
1400 | XPUSHs (boolSV (self->flags & ix)); |
1542 | XPUSHs (boolSV (self->flags & ix)); |
1401 | |
1543 | |
1402 | void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) |
1544 | void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) |