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.23 by root, Wed Nov 20 16:19:47 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_DEDUP_STRINGS 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_DEDUP_STRINGS))
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}
… …
225 } 271 }
226 272
227 --enc->depth; 273 --enc->depth;
228} 274}
229 275
276ecb_inline void
277encode_he (enc_t *enc, HE *he)
278{
279}
280
230static void 281static void
231encode_hv (enc_t *enc, HV *hv) 282encode_hv (enc_t *enc, HV *hv)
232{ 283{
233 HE *he; 284 HE *he;
234 285
… …
263 314
264// encode objects, arrays and special \0=false and \1=true values. 315// encode objects, arrays and special \0=false and \1=true values.
265static void 316static void
266encode_rv (enc_t *enc, SV *sv) 317encode_rv (enc_t *enc, SV *sv)
267{ 318{
268 svtype svt;
269
270 SvGETMAGIC (sv); 319 SvGETMAGIC (sv);
320
321 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
322 && ecb_expect_false (SvREFCNT (sv) > 1))
323 {
324 if (!enc->shareable)
325 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
326
327 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
328
329 if (SvOK (*svp))
330 {
331 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
332 encode_uint (enc, 0x00, SvUV (*svp));
333 return;
334 }
335 else
336 {
337 sv_setuv (*svp, enc->shareable_idx);
338 ++enc->shareable_idx;
339 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
340 }
341 }
342
271 svt = SvTYPE (sv); 343 svtype svt = SvTYPE (sv);
272 344
273 if (ecb_expect_false (SvOBJECT (sv))) 345 if (ecb_expect_false (SvOBJECT (sv)))
274 { 346 {
275 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash 347 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
276 ? types_boolean_stash 348 ? types_boolean_stash
… …
336 408
337 // catch this surprisingly common error 409 // catch this surprisingly common error
338 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 410 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)); 411 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
340 412
341 encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT); 413 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
342 encode_uint (enc, 0x80, count + 1); 414 encode_uint (enc, 0x80, count + 1);
343 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 415 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
344 416
345 while (count) 417 while (count)
346 encode_sv (enc, SP[1 - count--]); 418 encode_sv (enc, SP[1 - count--]);
… …
355 } 427 }
356 else if (svt == SVt_PVHV) 428 else if (svt == SVt_PVHV)
357 encode_hv (enc, (HV *)sv); 429 encode_hv (enc, (HV *)sv);
358 else if (svt == SVt_PVAV) 430 else if (svt == SVt_PVAV)
359 encode_av (enc, (AV *)sv); 431 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 432 else
378 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 433 {
379 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 434 encode_tag (enc, CBOR_TAG_INDIRECTION);
435 encode_sv (enc, sv);
436 }
380} 437}
381 438
382static void 439static void
383encode_nv (enc_t *enc, SV *sv) 440encode_nv (enc_t *enc, SV *sv)
384{ 441{
… …
449} 506}
450 507
451static SV * 508static SV *
452encode_cbor (SV *scalar, CBOR *cbor) 509encode_cbor (SV *scalar, CBOR *cbor)
453{ 510{
454 enc_t enc; 511 enc_t enc = { };
455 512
456 enc.cbor = *cbor; 513 enc.cbor = *cbor;
457 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 514 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
458 enc.cur = SvPVX (enc.sv); 515 enc.cur = SvPVX (enc.sv);
459 enc.end = SvEND (enc.sv); 516 enc.end = SvEND (enc.sv);
460 enc.depth = 0;
461 517
462 SvPOK_only (enc.sv); 518 SvPOK_only (enc.sv);
519
520 if (cbor->flags & F_DEDUP_STRINGS)
521 {
522 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
523 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
524 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
525 }
526
463 encode_sv (&enc, scalar); 527 encode_sv (&enc, scalar);
464 528
465 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 529 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
466 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 530 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
467 531
… …
481 U8 *end; // end of input string 545 U8 *end; // end of input string
482 const char *err; // parse error, if != 0 546 const char *err; // parse error, if != 0
483 CBOR cbor; 547 CBOR cbor;
484 U32 depth; // recursion depth 548 U32 depth; // recursion depth
485 U32 maxdepth; // recursion depth limit 549 U32 maxdepth; // recursion depth limit
550 AV *shareable;
551 AV *stringref;
486} dec_t; 552} dec_t;
487 553
488#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 554#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
489 555
490#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 556#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
… …
584 SvREFCNT_dec (av); 650 SvREFCNT_dec (av);
585 DEC_DEC_DEPTH; 651 DEC_DEC_DEPTH;
586 return &PL_sv_undef; 652 return &PL_sv_undef;
587} 653}
588 654
655static void
656decode_he (dec_t *dec, HV *hv)
657{
658 // for speed reasons, we specialcase single-string
659 // byte or utf-8 strings as keys, but only when !stringref
660
661 if (ecb_expect_true (!dec->stringref))
662 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27)
663 {
664 I32 len = decode_uint (dec);
665 char *key = (char *)dec->cur;
666
667 dec->cur += len;
668
669 if (ecb_expect_false (dec->stringref))
670 av_push (dec->stringref, newSVpvn (key, len));
671
672 hv_store (hv, key, len, decode_sv (dec), 0);
673
674 return;
675 }
676 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27)
677 {
678 I32 len = decode_uint (dec);
679 char *key = (char *)dec->cur;
680
681 dec->cur += len;
682
683 if (ecb_expect_false (dec->stringref))
684 av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
685
686 hv_store (hv, key, -len, decode_sv (dec), 0);
687
688 return;
689 }
690
691 SV *k = decode_sv (dec);
692 SV *v = decode_sv (dec);
693
694 hv_store_ent (hv, k, v, 0);
695 SvREFCNT_dec (k);
696}
697
589static SV * 698static SV *
590decode_hv (dec_t *dec) 699decode_hv (dec_t *dec)
591{ 700{
592 HV *hv = newHV (); 701 HV *hv = newHV ();
593 702
… …
605 { 714 {
606 ++dec->cur; 715 ++dec->cur;
607 break; 716 break;
608 } 717 }
609 718
610 SV *k = decode_sv (dec); 719 decode_he (dec, hv);
611 SV *v = decode_sv (dec);
612
613 hv_store_ent (hv, k, v, 0);
614 SvREFCNT_dec (k);
615 } 720 }
616 } 721 }
617 else 722 else
618 { 723 {
619 int len = decode_uint (dec); 724 int pairs = decode_uint (dec);
620 725
621 while (len--) 726 while (pairs--)
622 { 727 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 } 728 }
630 729
631 DEC_DEC_DEPTH; 730 DEC_DEC_DEPTH;
632 return newRV_noinc ((SV *)hv); 731 return newRV_noinc ((SV *)hv);
633 732
… …
672 } 771 }
673 772
674 if (utf8) 773 if (utf8)
675 SvUTF8_on (sv); 774 SvUTF8_on (sv);
676 775
776 if (ecb_expect_false (dec->stringref)
777 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
778 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
779
677 return sv; 780 return sv;
678 781
679fail: 782fail:
680 SvREFCNT_dec (sv); 783 SvREFCNT_dec (sv);
681 return &PL_sv_undef; 784 return &PL_sv_undef;
682} 785}
683 786
684static SV * 787static SV *
685decode_tagged (dec_t *dec) 788decode_tagged (dec_t *dec)
686{ 789{
790 SV *sv = 0;
687 UV tag = decode_uint (dec); 791 UV tag = decode_uint (dec);
792
793 WANT (1);
794
795 switch (tag)
796 {
797 case CBOR_TAG_MAGIC:
798 sv = decode_sv (dec);
799 break;
800
801 case CBOR_TAG_INDIRECTION:
802 sv = newRV_noinc (decode_sv (dec));
803 break;
804
805 case CBOR_TAG_STRINGREF_NAMESPACE:
806 {
807 ENTER; SAVETMPS;
808
809 SAVESPTR (dec->stringref);
810 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
811
812 sv = decode_sv (dec);
813
814 FREETMPS; LEAVE;
815 }
816 break;
817
818 case CBOR_TAG_STRINGREF:
819 {
820 if ((*dec->cur >> 5) != 0)
821 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
822
823 UV idx = decode_uint (dec);
824
825 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))
826 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
827
828 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
829 }
830 break;
831
832 case CBOR_TAG_VALUE_SHAREABLE:
833 {
834 if (ecb_expect_false (!dec->shareable))
835 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
836
837 sv = newSV (0);
838 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
839
688 SV *sv = decode_sv (dec); 840 SV *osv = decode_sv (dec);
841 sv_setsv (sv, osv);
842 SvREFCNT_dec_NN (osv);
843 }
844 break;
689 845
690 if (tag == CBOR_TAG_MAGIC) 846 case CBOR_TAG_VALUE_SHAREDREF:
691 return sv; 847 {
692 else if (tag == CBOR_TAG_PERL_OBJECT) 848 if ((*dec->cur >> 5) != 0)
693 { 849 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
850
851 UV idx = decode_uint (dec);
852
853 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))
854 ERR ("corrupted CBOR data (sharedref index out of bounds)");
855
856 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
857 }
858 break;
859
860 case CBOR_TAG_PERL_OBJECT:
861 {
862 sv = decode_sv (dec);
863
694 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 864 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
695 ERR ("corrupted CBOR data (non-array perl object)"); 865 ERR ("corrupted CBOR data (non-array perl object)");
696 866
697 AV *av = (AV *)SvRV (sv); 867 AV *av = (AV *)SvRV (sv);
698 int len = av_len (av) + 1; 868 int len = av_len (av) + 1;
699 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0); 869 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
700 870
701 if (!stash) 871 if (!stash)
702 ERR ("cannot decode perl-object (package does not exist)"); 872 ERR ("cannot decode perl-object (package does not exist)");
703 873
704 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0); 874 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
705 875
706 if (!method) 876 if (!method)
707 ERR ("cannot decode perl-object (package does not have a THAW method)"); 877 ERR ("cannot decode perl-object (package does not have a THAW method)");
708 878
709 dSP; 879 dSP;
710 880
711 ENTER; SAVETMPS; PUSHMARK (SP); 881 ENTER; SAVETMPS; PUSHMARK (SP);
712 EXTEND (SP, len + 1); 882 EXTEND (SP, len + 1);
713 // we re-bless the reference to get overload and other niceties right 883 // we re-bless the reference to get overload and other niceties right
714 PUSHs (*av_fetch (av, 0, 1)); 884 PUSHs (*av_fetch (av, 0, 1));
715 PUSHs (sv_cbor); 885 PUSHs (sv_cbor);
716 886
717 int i; 887 int i;
718 888
719 for (i = 1; i < len; ++i) 889 for (i = 1; i < len; ++i)
720 PUSHs (*av_fetch (av, i, 1)); 890 PUSHs (*av_fetch (av, i, 1));
721 891
722 PUTBACK; 892 PUTBACK;
723 call_sv ((SV *)GvCV (method), G_SCALAR); 893 call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
724 SPAGAIN; 894 SPAGAIN;
725 895
896 if (SvTRUE (ERRSV))
897 {
898 FREETMPS; LEAVE;
899 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
900 }
901
726 SvREFCNT_dec (sv); 902 SvREFCNT_dec (sv);
727 sv = SvREFCNT_inc (POPs); 903 sv = SvREFCNT_inc (POPs);
728 904
729 PUTBACK; 905 PUTBACK;
730 906
731 FREETMPS; LEAVE; 907 FREETMPS; LEAVE;
908 }
909 break;
732 910
733 return sv; 911 default:
734 } 912 {
735 else 913 sv = decode_sv (dec);
736 { 914
737 AV *av = newAV (); 915 AV *av = newAV ();
738 av_push (av, newSVuv (tag)); 916 av_push (av, newSVuv (tag));
739 av_push (av, sv); 917 av_push (av, sv);
740 918
741 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 919 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
742 ? cbor_tagged_stash 920 ? cbor_tagged_stash
743 : gv_stashpv ("CBOR::XS::Tagged" , 1); 921 : gv_stashpv ("CBOR::XS::Tagged" , 1);
744 922
745 return sv_bless (newRV_noinc ((SV *)av), tagged_stash); 923 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
924 }
925 break;
746 } 926 }
927
928 return sv;
747 929
748fail: 930fail:
749 SvREFCNT_dec (sv); 931 SvREFCNT_dec (sv);
750 return &PL_sv_undef; 932 return &PL_sv_undef;
751} 933}
… …
842} 1024}
843 1025
844static SV * 1026static SV *
845decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1027decode_cbor (SV *string, CBOR *cbor, char **offset_return)
846{ 1028{
847 dec_t dec; 1029 dec_t dec = { };
848 SV *sv; 1030 SV *sv;
1031 STRLEN len;
1032 char *data = SvPVbyte (string, len);
849 1033
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) 1034 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", 1035 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); 1036 (unsigned long)len, (unsigned long)cbor->max_size);
881 }
882
883 sv_utf8_downgrade (string, 0);
884 1037
885 dec.cbor = *cbor; 1038 dec.cbor = *cbor;
886 dec.cur = (U8 *)SvPVX (string); 1039 dec.cur = (U8 *)data;
887 dec.end = (U8 *)SvEND (string); 1040 dec.end = (U8 *)data + len;
888 dec.err = 0;
889 dec.depth = 0;
890 1041
891 sv = decode_sv (&dec); 1042 sv = decode_sv (&dec);
892 1043
893 if (offset_return) 1044 if (offset_return)
894 *offset_return = dec.cur; 1045 *offset_return = dec.cur;
… …
898 dec.err = "garbage after CBOR object"; 1049 dec.err = "garbage after CBOR object";
899 1050
900 if (dec.err) 1051 if (dec.err)
901 { 1052 {
902 SvREFCNT_dec (sv); 1053 SvREFCNT_dec (sv);
903 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 1054 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
904 } 1055 }
905 1056
906 sv = sv_2mortal (sv); 1057 sv = sv_2mortal (sv);
907 1058
908 return sv; 1059 return sv;
… …
952 1103
953void shrink (CBOR *self, int enable = 1) 1104void shrink (CBOR *self, int enable = 1)
954 ALIAS: 1105 ALIAS:
955 shrink = F_SHRINK 1106 shrink = F_SHRINK
956 allow_unknown = F_ALLOW_UNKNOWN 1107 allow_unknown = F_ALLOW_UNKNOWN
1108 allow_sharing = F_ALLOW_SHARING
1109 dedup_strings = F_DEDUP_STRINGS
957 PPCODE: 1110 PPCODE:
958{ 1111{
959 if (enable) 1112 if (enable)
960 self->flags |= ix; 1113 self->flags |= ix;
961 else 1114 else
… …
966 1119
967void get_shrink (CBOR *self) 1120void get_shrink (CBOR *self)
968 ALIAS: 1121 ALIAS:
969 get_shrink = F_SHRINK 1122 get_shrink = F_SHRINK
970 get_allow_unknown = F_ALLOW_UNKNOWN 1123 get_allow_unknown = F_ALLOW_UNKNOWN
1124 get_allow_sharing = F_ALLOW_SHARING
1125 get_dedup_strings = F_DEDUP_STRINGS
971 PPCODE: 1126 PPCODE:
972 XPUSHs (boolSV (self->flags & ix)); 1127 XPUSHs (boolSV (self->flags & ix));
973 1128
974void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1129void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
975 PPCODE: 1130 PPCODE:

Diff Legend

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