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.15 by root, Tue Oct 29 18:37:31 2013 UTC vs.
Revision 1.26 by root, Fri Nov 22 09:40:13 2013 UTC

… …
24 24
25// known tags 25// known tags
26enum cbor_tag 26enum cbor_tag
27{ 27{
28 // inofficial extensions (pending iana registration) 28 // inofficial extensions (pending iana registration)
29 CBOR_TAG_PERL_OBJECT = 256, 29 CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object
30 CBOR_TAG_GENERIC_OBJECT = 257, 30 CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object
31 CBOR_TAG_VALUE_SHAREABLE = 26, // http://cbor.schmorp.de/value-sharing
32 CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing
33 CBOR_TAG_STRINGREF_NAMESPACE = 65537, // http://cbor.schmorp.de/stringref
34 CBOR_TAG_STRINGREF = 28, // http://cbor.schmorp.de/stringref
35 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
31 36
32 // rfc7049 37 // rfc7049
33 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8 38 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
34 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any 39 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
35 CBOR_TAG_POS_BIGNUM = 2, // byte string 40 CBOR_TAG_POS_BIGNUM = 2, // byte string
… …
49 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 54 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
50 55
51 CBOR_TAG_MAGIC = 55799 // self-describe cbor 56 CBOR_TAG_MAGIC = 55799 // self-describe cbor
52}; 57};
53 58
54#define F_SHRINK 0x00000200UL 59#define F_SHRINK 0x00000001UL
55#define F_ALLOW_UNKNOWN 0x00002000UL 60#define F_ALLOW_UNKNOWN 0x00000002UL
61#define F_ALLOW_SHARING 0x00000004UL //TODO
62#define F_ALLOW_STRINGREF 0x00000008UL //TODO
56 63
57#define INIT_SIZE 32 // initial scalar size to be allocated 64#define INIT_SIZE 32 // initial scalar size to be allocated
58 65
59#define SB do { 66#define SB do {
60#define SE } while (0) 67#define SE } while (0)
… …
116 SvPV_renew (sv, SvCUR (sv) + 1); 123 SvPV_renew (sv, SvCUR (sv) + 1);
117#endif 124#endif
118 } 125 }
119} 126}
120 127
121///////////////////////////////////////////////////////////////////////////// 128// minimum length of a string to be registered for stringref
122// fp hell 129ecb_inline int
123 130minimum_string_length (UV idx)
124//TODO 131{
132 return idx > 23
133 ? idx > 0xffU
134 ? idx > 0xffffU
135 ? idx > 0xffffffffU
136 ? 7
137 : 6
138 : 5
139 : 4
140 : 3;
141}
125 142
126///////////////////////////////////////////////////////////////////////////// 143/////////////////////////////////////////////////////////////////////////////
127// encoder 144// encoder
128 145
129// structure used for encoding CBOR 146// structure used for encoding CBOR
… …
132 char *cur; // SvPVX (sv) + current output position 149 char *cur; // SvPVX (sv) + current output position
133 char *end; // SvEND (sv) 150 char *end; // SvEND (sv)
134 SV *sv; // result scalar 151 SV *sv; // result scalar
135 CBOR cbor; 152 CBOR cbor;
136 U32 depth; // recursion level 153 U32 depth; // recursion level
154 HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
155 UV stringref_idx;
156 HV *shareable; // ptr => index, or 0
157 UV shareable_idx;
137} enc_t; 158} enc_t;
138 159
139ecb_inline void 160ecb_inline void
140need (enc_t *enc, STRLEN len) 161need (enc_t *enc, STRLEN len)
141{ 162{
… …
193 *enc->cur++ = len >> 8; 214 *enc->cur++ = len >> 8;
194 *enc->cur++ = len; 215 *enc->cur++ = len;
195 } 216 }
196} 217}
197 218
219ecb_inline void
220encode_tag (enc_t *enc, UV tag)
221{
222 encode_uint (enc, 0xc0, tag);
223}
224
198static void 225static void
199encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 226encode_str (enc_t *enc, int utf8, char *str, STRLEN len)
200{ 227{
228 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))
229 {
230 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
231
232 if (SvOK (*svp))
233 {
234 // already registered, use stringref
235 encode_tag (enc, CBOR_TAG_STRINGREF);
236 encode_uint (enc, 0x00, SvUV (*svp));
237 return;
238 }
239 else if (len >= minimum_string_length (enc->stringref_idx))
240 {
241 // register only
242 sv_setuv (*svp, enc->stringref_idx);
243 ++enc->stringref_idx;
244 }
245 }
246
201 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 247 encode_uint (enc, utf8 ? 0x60 : 0x40, len);
202 need (enc, len); 248 need (enc, len);
203 memcpy (enc->cur, str, len); 249 memcpy (enc->cur, str, len);
204 enc->cur += len; 250 enc->cur += len;
205} 251}
… …
263 309
264// encode objects, arrays and special \0=false and \1=true values. 310// encode objects, arrays and special \0=false and \1=true values.
265static void 311static void
266encode_rv (enc_t *enc, SV *sv) 312encode_rv (enc_t *enc, SV *sv)
267{ 313{
268 svtype svt;
269
270 SvGETMAGIC (sv); 314 SvGETMAGIC (sv);
315
316 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
317 && ecb_expect_false (SvREFCNT (sv) > 1))
318 {
319 if (!enc->shareable)
320 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
321
322 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
323
324 if (SvOK (*svp))
325 {
326 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
327 encode_uint (enc, 0x00, SvUV (*svp));
328 return;
329 }
330 else
331 {
332 sv_setuv (*svp, enc->shareable_idx);
333 ++enc->shareable_idx;
334 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
335 }
336 }
337
271 svt = SvTYPE (sv); 338 svtype svt = SvTYPE (sv);
272 339
273 if (ecb_expect_false (SvOBJECT (sv))) 340 if (ecb_expect_false (SvOBJECT (sv)))
274 { 341 {
275 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash 342 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
276 ? types_boolean_stash 343 ? types_boolean_stash
… …
336 403
337 // catch this surprisingly common error 404 // catch this surprisingly common error
338 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 405 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
339 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 406 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
340 407
341 encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT); 408 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
342 encode_uint (enc, 0x80, count + 1); 409 encode_uint (enc, 0x80, count + 1);
343 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 410 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
344 411
345 while (count) 412 while (count)
346 encode_sv (enc, SP[1 - count--]); 413 encode_sv (enc, SP[1 - count--]);
… …
355 } 422 }
356 else if (svt == SVt_PVHV) 423 else if (svt == SVt_PVHV)
357 encode_hv (enc, (HV *)sv); 424 encode_hv (enc, (HV *)sv);
358 else if (svt == SVt_PVAV) 425 else if (svt == SVt_PVAV)
359 encode_av (enc, (AV *)sv); 426 encode_av (enc, (AV *)sv);
360 else if (svt < SVt_PVAV)
361 {
362 STRLEN len = 0;
363 char *pv = svt ? SvPV (sv, len) : 0;
364
365 if (len == 1 && *pv == '1')
366 encode_ch (enc, 0xe0 | 21);
367 else if (len == 1 && *pv == '0')
368 encode_ch (enc, 0xe0 | 20);
369 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
370 encode_ch (enc, 0xe0 | 23);
371 else
372 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
373 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
374 }
375 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
376 encode_ch (enc, 0xe0 | 23);
377 else 427 else
378 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 428 {
379 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 429 encode_tag (enc, CBOR_TAG_INDIRECTION);
430 encode_sv (enc, sv);
431 }
380} 432}
381 433
382static void 434static void
383encode_nv (enc_t *enc, SV *sv) 435encode_nv (enc_t *enc, SV *sv)
384{ 436{
… …
449} 501}
450 502
451static SV * 503static SV *
452encode_cbor (SV *scalar, CBOR *cbor) 504encode_cbor (SV *scalar, CBOR *cbor)
453{ 505{
454 enc_t enc; 506 enc_t enc = { };
455 507
456 enc.cbor = *cbor; 508 enc.cbor = *cbor;
457 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 509 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
458 enc.cur = SvPVX (enc.sv); 510 enc.cur = SvPVX (enc.sv);
459 enc.end = SvEND (enc.sv); 511 enc.end = SvEND (enc.sv);
460 enc.depth = 0;
461 512
462 SvPOK_only (enc.sv); 513 SvPOK_only (enc.sv);
514
515 if (cbor->flags & F_ALLOW_STRINGREF)
516 {
517 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
518 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
519 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
520 }
521
463 encode_sv (&enc, scalar); 522 encode_sv (&enc, scalar);
464 523
465 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 524 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
466 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 525 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
467 526
… …
481 U8 *end; // end of input string 540 U8 *end; // end of input string
482 const char *err; // parse error, if != 0 541 const char *err; // parse error, if != 0
483 CBOR cbor; 542 CBOR cbor;
484 U32 depth; // recursion depth 543 U32 depth; // recursion depth
485 U32 maxdepth; // recursion depth limit 544 U32 maxdepth; // recursion depth limit
545 AV *shareable;
546 AV *stringref;
486} dec_t; 547} dec_t;
487 548
488#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 549#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
489 550
490#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 551#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
… …
584 SvREFCNT_dec (av); 645 SvREFCNT_dec (av);
585 DEC_DEC_DEPTH; 646 DEC_DEC_DEPTH;
586 return &PL_sv_undef; 647 return &PL_sv_undef;
587} 648}
588 649
650static void
651decode_he (dec_t *dec, HV *hv)
652{
653 // for speed reasons, we specialcase single-string
654 // byte or utf-8 strings as keys, but only when !stringref
655
656 if (ecb_expect_true (!dec->stringref))
657 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27)
658 {
659 I32 len = decode_uint (dec);
660 char *key = (char *)dec->cur;
661
662 dec->cur += len;
663
664 if (ecb_expect_false (dec->stringref))
665 av_push (dec->stringref, newSVpvn (key, len));
666
667 hv_store (hv, key, len, decode_sv (dec), 0);
668
669 return;
670 }
671 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27)
672 {
673 I32 len = decode_uint (dec);
674 char *key = (char *)dec->cur;
675
676 dec->cur += len;
677
678 if (ecb_expect_false (dec->stringref))
679 av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
680
681 hv_store (hv, key, -len, decode_sv (dec), 0);
682
683 return;
684 }
685
686 SV *k = decode_sv (dec);
687 SV *v = decode_sv (dec);
688
689 hv_store_ent (hv, k, v, 0);
690 SvREFCNT_dec (k);
691}
692
589static SV * 693static SV *
590decode_hv (dec_t *dec) 694decode_hv (dec_t *dec)
591{ 695{
592 HV *hv = newHV (); 696 HV *hv = newHV ();
593 697
… …
605 { 709 {
606 ++dec->cur; 710 ++dec->cur;
607 break; 711 break;
608 } 712 }
609 713
610 SV *k = decode_sv (dec); 714 decode_he (dec, hv);
611 SV *v = decode_sv (dec);
612
613 hv_store_ent (hv, k, v, 0);
614 SvREFCNT_dec (k);
615 } 715 }
616 } 716 }
617 else 717 else
618 { 718 {
619 int len = decode_uint (dec); 719 int pairs = decode_uint (dec);
620 720
621 while (len--) 721 while (pairs--)
622 { 722 decode_he (dec, hv);
623 SV *k = decode_sv (dec);
624 SV *v = decode_sv (dec);
625
626 hv_store_ent (hv, k, v, 0);
627 SvREFCNT_dec (k);
628 }
629 } 723 }
630 724
631 DEC_DEC_DEPTH; 725 DEC_DEC_DEPTH;
632 return newRV_noinc ((SV *)hv); 726 return newRV_noinc ((SV *)hv);
633 727
… …
667 STRLEN len = decode_uint (dec); 761 STRLEN len = decode_uint (dec);
668 762
669 WANT (len); 763 WANT (len);
670 sv = newSVpvn (dec->cur, len); 764 sv = newSVpvn (dec->cur, len);
671 dec->cur += len; 765 dec->cur += len;
766
767 if (ecb_expect_false (dec->stringref)
768 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
769 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
672 } 770 }
673 771
674 if (utf8) 772 if (utf8)
675 SvUTF8_on (sv); 773 SvUTF8_on (sv);
676 774
… …
682} 780}
683 781
684static SV * 782static SV *
685decode_tagged (dec_t *dec) 783decode_tagged (dec_t *dec)
686{ 784{
785 SV *sv = 0;
687 UV tag = decode_uint (dec); 786 UV tag = decode_uint (dec);
787
788 WANT (1);
789
790 switch (tag)
791 {
792 case CBOR_TAG_MAGIC:
793 sv = decode_sv (dec);
794 break;
795
796 case CBOR_TAG_INDIRECTION:
797 sv = newRV_noinc (decode_sv (dec));
798 break;
799
800 case CBOR_TAG_STRINGREF_NAMESPACE:
801 {
802 ENTER; SAVETMPS;
803
804 SAVESPTR (dec->stringref);
805 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
806
807 sv = decode_sv (dec);
808
809 FREETMPS; LEAVE;
810 }
811 break;
812
813 case CBOR_TAG_STRINGREF:
814 {
815 if ((*dec->cur >> 5) != 0)
816 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
817
818 UV idx = decode_uint (dec);
819
820 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))
821 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
822
823 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
824 }
825 break;
826
827 case CBOR_TAG_VALUE_SHAREABLE:
828 {
829 if (ecb_expect_false (!dec->shareable))
830 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
831
832 sv = newSV (0);
833 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
834
688 SV *sv = decode_sv (dec); 835 SV *osv = decode_sv (dec);
836 sv_setsv (sv, osv);
837 SvREFCNT_dec_NN (osv);
838 }
839 break;
689 840
690 if (tag == CBOR_TAG_MAGIC) 841 case CBOR_TAG_VALUE_SHAREDREF:
691 return sv; 842 {
692 else if (tag == CBOR_TAG_PERL_OBJECT) 843 if ((*dec->cur >> 5) != 0)
693 { 844 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
845
846 UV idx = decode_uint (dec);
847
848 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))
849 ERR ("corrupted CBOR data (sharedref index out of bounds)");
850
851 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
852 }
853 break;
854
855 case CBOR_TAG_PERL_OBJECT:
856 {
857 sv = decode_sv (dec);
858
694 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 859 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
695 ERR ("corrupted CBOR data (non-array perl object)"); 860 ERR ("corrupted CBOR data (non-array perl object)");
696 861
697 AV *av = (AV *)SvRV (sv); 862 AV *av = (AV *)SvRV (sv);
698 int len = av_len (av) + 1; 863 int len = av_len (av) + 1;
699 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0); 864 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
700 865
701 if (!stash) 866 if (!stash)
702 ERR ("cannot decode perl-object (package does not exist)"); 867 ERR ("cannot decode perl-object (package does not exist)");
703 868
704 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0); 869 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
705 870
706 if (!method) 871 if (!method)
707 ERR ("cannot decode perl-object (package does not have a THAW method)"); 872 ERR ("cannot decode perl-object (package does not have a THAW method)");
708 873
709 dSP; 874 dSP;
710 875
711 ENTER; SAVETMPS; PUSHMARK (SP); 876 ENTER; SAVETMPS; PUSHMARK (SP);
712 EXTEND (SP, len + 1); 877 EXTEND (SP, len + 1);
713 // we re-bless the reference to get overload and other niceties right 878 // we re-bless the reference to get overload and other niceties right
714 PUSHs (*av_fetch (av, 0, 1)); 879 PUSHs (*av_fetch (av, 0, 1));
715 PUSHs (sv_cbor); 880 PUSHs (sv_cbor);
716 881
717 int i; 882 int i;
718 883
719 for (i = 1; i < len; ++i) 884 for (i = 1; i < len; ++i)
720 PUSHs (*av_fetch (av, i, 1)); 885 PUSHs (*av_fetch (av, i, 1));
721 886
722 PUTBACK; 887 PUTBACK;
723 call_sv ((SV *)GvCV (method), G_SCALAR); 888 call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
724 SPAGAIN; 889 SPAGAIN;
725 890
891 if (SvTRUE (ERRSV))
892 {
893 FREETMPS; LEAVE;
894 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
895 }
896
726 SvREFCNT_dec (sv); 897 SvREFCNT_dec (sv);
727 sv = SvREFCNT_inc (POPs); 898 sv = SvREFCNT_inc (POPs);
728 899
729 PUTBACK; 900 PUTBACK;
730 901
731 FREETMPS; LEAVE; 902 FREETMPS; LEAVE;
903 }
904 break;
732 905
733 return sv; 906 default:
734 } 907 {
735 else 908 sv = decode_sv (dec);
736 { 909
737 AV *av = newAV (); 910 AV *av = newAV ();
738 av_push (av, newSVuv (tag)); 911 av_push (av, newSVuv (tag));
739 av_push (av, sv); 912 av_push (av, sv);
740 913
741 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 914 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
742 ? cbor_tagged_stash 915 ? cbor_tagged_stash
743 : gv_stashpv ("CBOR::XS::Tagged" , 1); 916 : gv_stashpv ("CBOR::XS::Tagged" , 1);
744 917
745 return sv_bless (newRV_noinc ((SV *)av), tagged_stash); 918 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
919 }
920 break;
746 } 921 }
922
923 return sv;
747 924
748fail: 925fail:
749 SvREFCNT_dec (sv); 926 SvREFCNT_dec (sv);
750 return &PL_sv_undef; 927 return &PL_sv_undef;
751} 928}
… …
842} 1019}
843 1020
844static SV * 1021static SV *
845decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1022decode_cbor (SV *string, CBOR *cbor, char **offset_return)
846{ 1023{
847 dec_t dec; 1024 dec_t dec = { };
848 SV *sv; 1025 SV *sv;
1026 STRLEN len;
1027 char *data = SvPVbyte (string, len);
849 1028
850 /* work around bugs in 5.10 where manipulating magic values
851 * makes perl ignore the magic in subsequent accesses.
852 * also make a copy of non-PV values, to get them into a clean
853 * state (SvPV should do that, but it's buggy, see below).
854 */
855 /*SvGETMAGIC (string);*/
856 if (SvMAGICAL (string) || !SvPOK (string))
857 string = sv_2mortal (newSVsv (string));
858
859 SvUPGRADE (string, SVt_PV);
860
861 /* work around a bug in perl 5.10, which causes SvCUR to fail an
862 * assertion with -DDEBUGGING, although SvCUR is documented to
863 * return the xpv_cur field which certainly exists after upgrading.
864 * according to nicholas clark, calling SvPOK fixes this.
865 * But it doesn't fix it, so try another workaround, call SvPV_nolen
866 * and hope for the best.
867 * Damnit, SvPV_nolen still trips over yet another assertion. This
868 * assertion business is seriously broken, try yet another workaround
869 * for the broken -DDEBUGGING.
870 */
871 {
872#ifdef DEBUGGING
873 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
874#else
875 STRLEN offset = SvCUR (string);
876#endif
877
878 if (offset > cbor->max_size && cbor->max_size) 1029 if (len > cbor->max_size && cbor->max_size)
879 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu", 1030 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
880 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 1031 (unsigned long)len, (unsigned long)cbor->max_size);
881 }
882
883 sv_utf8_downgrade (string, 0);
884 1032
885 dec.cbor = *cbor; 1033 dec.cbor = *cbor;
886 dec.cur = (U8 *)SvPVX (string); 1034 dec.cur = (U8 *)data;
887 dec.end = (U8 *)SvEND (string); 1035 dec.end = (U8 *)data + len;
888 dec.err = 0;
889 dec.depth = 0;
890 1036
891 sv = decode_sv (&dec); 1037 sv = decode_sv (&dec);
892 1038
893 if (offset_return) 1039 if (offset_return)
894 *offset_return = dec.cur; 1040 *offset_return = dec.cur;
… …
898 dec.err = "garbage after CBOR object"; 1044 dec.err = "garbage after CBOR object";
899 1045
900 if (dec.err) 1046 if (dec.err)
901 { 1047 {
902 SvREFCNT_dec (sv); 1048 SvREFCNT_dec (sv);
903 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 1049 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
904 } 1050 }
905 1051
906 sv = sv_2mortal (sv); 1052 sv = sv_2mortal (sv);
907 1053
908 return sv; 1054 return sv;
… …
952 1098
953void shrink (CBOR *self, int enable = 1) 1099void shrink (CBOR *self, int enable = 1)
954 ALIAS: 1100 ALIAS:
955 shrink = F_SHRINK 1101 shrink = F_SHRINK
956 allow_unknown = F_ALLOW_UNKNOWN 1102 allow_unknown = F_ALLOW_UNKNOWN
1103 allow_sharing = F_ALLOW_SHARING
1104 allow_stringref = F_ALLOW_STRINGREF
957 PPCODE: 1105 PPCODE:
958{ 1106{
959 if (enable) 1107 if (enable)
960 self->flags |= ix; 1108 self->flags |= ix;
961 else 1109 else
… …
966 1114
967void get_shrink (CBOR *self) 1115void get_shrink (CBOR *self)
968 ALIAS: 1116 ALIAS:
969 get_shrink = F_SHRINK 1117 get_shrink = F_SHRINK
970 get_allow_unknown = F_ALLOW_UNKNOWN 1118 get_allow_unknown = F_ALLOW_UNKNOWN
1119 get_allow_sharing = F_ALLOW_SHARING
1120 get_allow_stringref = F_ALLOW_STRINGREF
971 PPCODE: 1121 PPCODE:
972 XPUSHs (boolSV (self->flags & ix)); 1122 XPUSHs (boolSV (self->flags & ix));
973 1123
974void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1124void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
975 PPCODE: 1125 PPCODE:

Diff Legend

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