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.5 by root, Sat Oct 26 21:14:20 2013 UTC vs.
Revision 1.17 by root, Tue Oct 29 22:04:52 2013 UTC

… …
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11 11
12#include "ecb.h" 12#include "ecb.h"
13
14// compatibility with perl <5.18
15#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
17#endif
18#ifndef HvNAMELEN
19# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20#endif
21#ifndef HvNAMEUTF8
22# define HvNAMEUTF8(hv) 0
23#endif
24
25// known tags
26enum cbor_tag
27{
28 // inofficial extensions (pending iana registration)
29 CBOR_TAG_PERL_OBJECT = 256,
30 CBOR_TAG_GENERIC_OBJECT = 257,
31
32 // rfc7049
33 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
34 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
35 CBOR_TAG_POS_BIGNUM = 2, // byte string
36 CBOR_TAG_NEG_BIGNUM = 3, // byte string
37 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
38 CBOR_TAG_BIGFLOAT = 5, // array
39
40 CBOR_TAG_CONV_B64U = 21, // base64url, any
41 CBOR_TAG_CONV_B64 = 22, // base64, any
42 CBOR_TAG_CONV_HEX = 23, // base16, any
43 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
44
45 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
46 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
47 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
48 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
49 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
50
51 CBOR_TAG_MAGIC = 55799 // self-describe cbor
52};
13 53
14#define F_SHRINK 0x00000200UL 54#define F_SHRINK 0x00000200UL
15#define F_ALLOW_UNKNOWN 0x00002000UL 55#define F_ALLOW_UNKNOWN 0x00002000UL
16 56
17#define INIT_SIZE 32 // initial scalar size to be allocated 57#define INIT_SIZE 32 // initial scalar size to be allocated
… …
31#else 71#else
32# define CBOR_SLOW 0 72# define CBOR_SLOW 0
33# define CBOR_STASH cbor_stash 73# define CBOR_STASH cbor_stash
34#endif 74#endif
35 75
36static HV *cbor_stash, *cbor_boolean_stash; // CBOR::XS:: 76static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
37static SV *cbor_true, *cbor_false; 77static SV *types_true, *types_false, *types_error, *sv_cbor;
38 78
39typedef struct { 79typedef struct {
40 U32 flags; 80 U32 flags;
41 U32 max_depth; 81 U32 max_depth;
42 STRLEN max_size; 82 STRLEN max_size;
43
44 SV *cb_object;
45 HV *cb_sk_object;
46} CBOR; 83} CBOR;
47 84
48ecb_inline void 85ecb_inline void
49cbor_init (CBOR *cbor) 86cbor_init (CBOR *cbor)
50{ 87{
… …
233 SvGETMAGIC (sv); 270 SvGETMAGIC (sv);
234 svt = SvTYPE (sv); 271 svt = SvTYPE (sv);
235 272
236 if (ecb_expect_false (SvOBJECT (sv))) 273 if (ecb_expect_false (SvOBJECT (sv)))
237 { 274 {
238 HV *stash = !CBOR_SLOW || cbor_boolean_stash 275 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
239 ? cbor_boolean_stash 276 ? types_boolean_stash
277 : gv_stashpv ("Types::Serialiser::Boolean", 1);
278 HV *error_stash = !CBOR_SLOW || types_error_stash
279 ? types_error_stash
280 : gv_stashpv ("Types::Serialiser::Error", 1);
281 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
282 ? cbor_tagged_stash
240 : gv_stashpv ("CBOR::XS::Boolean", 1); 283 : gv_stashpv ("CBOR::XS::Tagged" , 1);
241 284
242 if (SvSTASH (sv) == stash) 285 HV *stash = SvSTASH (sv);
286 GV *method;
287
288 if (stash == boolean_stash)
243 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 289 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
290 else if (stash == error_stash)
291 encode_ch (enc, 0xe0 | 23);
292 else if (stash == tagged_stash)
293 {
294 if (svt != SVt_PVAV)
295 croak ("encountered CBOR::XS::Tagged object that isn't an array");
296
297 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
298 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
299 }
300 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
301 {
302 dSP;
303
304 ENTER; SAVETMPS; PUSHMARK (SP);
305 // we re-bless the reference to get overload and other niceties right
306 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
307
308 PUTBACK;
309 // G_SCALAR ensures that return value is 1
310 call_sv ((SV *)GvCV (method), G_SCALAR);
311 SPAGAIN;
312
313 // catch this surprisingly common error
314 if (SvROK (TOPs) && SvRV (TOPs) == sv)
315 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
316
317 encode_sv (enc, POPs);
318
319 PUTBACK;
320
321 FREETMPS; LEAVE;
322 }
323 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
324 {
325 dSP;
326
327 ENTER; SAVETMPS; PUSHMARK (SP);
328 EXTEND (SP, 2);
329 // we re-bless the reference to get overload and other niceties right
330 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
331 PUSHs (sv_cbor);
332
333 PUTBACK;
334 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
335 SPAGAIN;
336
337 // catch this surprisingly common error
338 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));
340
341 encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT);
342 encode_uint (enc, 0x80, count + 1);
343 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
344
345 while (count)
346 encode_sv (enc, SP[1 - count--]);
347
348 PUTBACK;
349
350 FREETMPS; LEAVE;
351 }
244 else 352 else
245 {
246#if 0 //TODO
247 if (enc->cbor.flags & F_CONV_BLESSED)
248 {
249 // we re-bless the reference to get overload and other niceties right
250 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
251
252 if (to_cbor)
253 {
254 dSP;
255
256 ENTER; SAVETMPS; PUSHMARK (SP);
257 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
258
259 // calling with G_SCALAR ensures that we always get a 1 return value
260 PUTBACK;
261 call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
262 SPAGAIN;
263
264 // catch this surprisingly common error
265 if (SvROK (TOPs) && SvRV (TOPs) == sv)
266 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
267
268 sv = POPs;
269 PUTBACK;
270
271 encode_sv (enc, sv);
272
273 FREETMPS; LEAVE;
274 }
275 else if (enc->cbor.flags & F_ALLOW_BLESSED)
276 encode_str (enc, "null", 4, 0);
277 else
278 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it", 353 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
279 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
280 }
281 else if (enc->cbor.flags & F_ALLOW_BLESSED)
282 encode_str (enc, "null", 4, 0);
283 else
284 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
285 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 354 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
286#endif
287 }
288 } 355 }
289 else if (svt == SVt_PVHV) 356 else if (svt == SVt_PVHV)
290 encode_hv (enc, (HV *)sv); 357 encode_hv (enc, (HV *)sv);
291 else if (svt == SVt_PVAV) 358 else if (svt == SVt_PVAV)
292 encode_av (enc, (AV *)sv); 359 encode_av (enc, (AV *)sv);
… …
517 SvREFCNT_dec (av); 584 SvREFCNT_dec (av);
518 DEC_DEC_DEPTH; 585 DEC_DEC_DEPTH;
519 return &PL_sv_undef; 586 return &PL_sv_undef;
520} 587}
521 588
589static void
590decode_he (dec_t *dec, HV *hv)
591{
592 // for speed reasons, we specialcase single-string
593 // byte or utf-8 strings as keys.
594
595 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27)
596 {
597 I32 len = decode_uint (dec);
598 char *key = (char *)dec->cur;
599
600 dec->cur += len;
601
602 hv_store (hv, key, len, decode_sv (dec), 0);
603 }
604 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27)
605 {
606 I32 len = decode_uint (dec);
607 char *key = (char *)dec->cur;
608
609 dec->cur += len;
610
611 hv_store (hv, key, -len, decode_sv (dec), 0);
612 }
613 else
614 {
615 SV *k = decode_sv (dec);
616 SV *v = decode_sv (dec);
617
618 hv_store_ent (hv, k, v, 0);
619 SvREFCNT_dec (k);
620 }
621}
622
522static SV * 623static SV *
523decode_hv (dec_t *dec) 624decode_hv (dec_t *dec)
524{ 625{
525 HV *hv = newHV (); 626 HV *hv = newHV ();
526 627
… …
538 { 639 {
539 ++dec->cur; 640 ++dec->cur;
540 break; 641 break;
541 } 642 }
542 643
543 SV *k = decode_sv (dec); 644 decode_he (dec, hv);
544 SV *v = decode_sv (dec);
545
546 hv_store_ent (hv, k, v, 0);
547 } 645 }
548 } 646 }
549 else 647 else
550 { 648 {
551 int len = decode_uint (dec); 649 int pairs = decode_uint (dec);
552 650
553 while (len--) 651 while (pairs--)
554 { 652 decode_he (dec, hv);
555 SV *k = decode_sv (dec);
556 SV *v = decode_sv (dec);
557
558 hv_store_ent (hv, k, v, 0);
559 }
560 } 653 }
561 654
562 DEC_DEC_DEPTH; 655 DEC_DEC_DEPTH;
563 return newRV_noinc ((SV *)hv); 656 return newRV_noinc ((SV *)hv);
564
565#if 0
566 SV *sv;
567 HV *hv = newHV ();
568
569 DEC_INC_DEPTH;
570 decode_ws (dec);
571
572 for (;;)
573 {
574 // heuristic: assume that
575 // a) decode_str + hv_store_ent are abysmally slow.
576 // b) most hash keys are short, simple ascii text.
577 // => try to "fast-match" such strings to avoid
578 // the overhead of decode_str + hv_store_ent.
579 {
580 SV *value;
581 char *p = dec->cur;
582 char *e = p + 24; // only try up to 24 bytes
583
584 for (;;)
585 {
586 // the >= 0x80 is false on most architectures
587 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
588 {
589 // slow path, back up and use decode_str
590 SV *key = decode_str (dec);
591 if (!key)
592 goto fail;
593
594 decode_ws (dec); EXPECT_CH (':');
595
596 decode_ws (dec);
597 value = decode_sv (dec);
598 if (!value)
599 {
600 SvREFCNT_dec (key);
601 goto fail;
602 }
603
604 hv_store_ent (hv, key, value, 0);
605 SvREFCNT_dec (key);
606
607 break;
608 }
609 else if (*p == '"')
610 {
611 // fast path, got a simple key
612 char *key = dec->cur;
613 int len = p - key;
614 dec->cur = p + 1;
615
616 decode_ws (dec); EXPECT_CH (':');
617
618 decode_ws (dec);
619 value = decode_sv (dec);
620 if (!value)
621 goto fail;
622
623 hv_store (hv, key, len, value, 0);
624
625 break;
626 }
627
628 ++p;
629 }
630 }
631
632 decode_ws (dec);
633
634 if (*dec->cur == '}')
635 {
636 ++dec->cur;
637 break;
638 }
639
640 if (*dec->cur != ',')
641 ERR (", or } expected while parsing object/hash");
642
643 ++dec->cur;
644
645 decode_ws (dec);
646
647 if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED)
648 {
649 ++dec->cur;
650 break;
651 }
652 }
653
654 DEC_DEC_DEPTH;
655 sv = newRV_noinc ((SV *)hv);
656
657 // check filter callbacks
658 if (dec->cbor.flags & F_HOOK)
659 {
660 if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1)
661 {
662 HE *cb, *he;
663
664 hv_iterinit (hv);
665 he = hv_iternext (hv);
666 hv_iterinit (hv);
667
668 // the next line creates a mortal sv each time its called.
669 // might want to optimise this for common cases.
670 cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0);
671
672 if (cb)
673 {
674 dSP;
675 int count;
676
677 ENTER; SAVETMPS; PUSHMARK (SP);
678 XPUSHs (HeVAL (he));
679 sv_2mortal (sv);
680
681 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
682
683 if (count == 1)
684 {
685 sv = newSVsv (POPs);
686 FREETMPS; LEAVE;
687 return sv;
688 }
689
690 SvREFCNT_inc (sv);
691 FREETMPS; LEAVE;
692 }
693 }
694
695 if (dec->cbor.cb_object)
696 {
697 dSP;
698 int count;
699
700 ENTER; SAVETMPS; PUSHMARK (SP);
701 XPUSHs (sv_2mortal (sv));
702
703 PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN;
704
705 if (count == 1)
706 {
707 sv = newSVsv (POPs);
708 FREETMPS; LEAVE;
709 return sv;
710 }
711
712 SvREFCNT_inc (sv);
713 FREETMPS; LEAVE;
714 }
715 }
716
717 return sv;
718#endif
719 657
720fail: 658fail:
721 SvREFCNT_dec (hv); 659 SvREFCNT_dec (hv);
722 DEC_DEC_DEPTH; 660 DEC_DEC_DEPTH;
723 return &PL_sv_undef; 661 return &PL_sv_undef;
724} 662}
725 663
726static SV * 664static SV *
727decode_str (dec_t *dec, int utf8) 665decode_str (dec_t *dec, int utf8)
728{ 666{
729 SV *sv; 667 SV *sv = 0;
730 668
731 if ((*dec->cur & 31) == 31) 669 if ((*dec->cur & 31) == 31)
732 { 670 {
733 ++dec->cur; 671 ++dec->cur;
734 672
… …
743 { 681 {
744 ++dec->cur; 682 ++dec->cur;
745 break; 683 break;
746 } 684 }
747 685
748 SV *sv2 = decode_sv (dec);
749 sv_catsv (sv, sv2); 686 sv_catsv (sv, decode_sv (dec));
750 } 687 }
751 } 688 }
752 else 689 else
753 { 690 {
754 STRLEN len = decode_uint (dec); 691 STRLEN len = decode_uint (dec);
… …
762 SvUTF8_on (sv); 699 SvUTF8_on (sv);
763 700
764 return sv; 701 return sv;
765 702
766fail: 703fail:
704 SvREFCNT_dec (sv);
767 return &PL_sv_undef; 705 return &PL_sv_undef;
768} 706}
769 707
770static SV * 708static SV *
771decode_tagged (dec_t *dec) 709decode_tagged (dec_t *dec)
772{ 710{
773 UV tag = decode_uint (dec); 711 UV tag = decode_uint (dec);
774 SV *sv = decode_sv (dec); 712 SV *sv = decode_sv (dec);
775 713
776 if (tag == 55799) // 2.4.5 Self-Describe CBOR 714 if (tag == CBOR_TAG_MAGIC)
777 return sv; 715 return sv;
716 else if (tag == CBOR_TAG_PERL_OBJECT)
717 {
718 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
719 ERR ("corrupted CBOR data (non-array perl object)");
778 720
721 AV *av = (AV *)SvRV (sv);
722 int len = av_len (av) + 1;
723 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
724
725 if (!stash)
726 ERR ("cannot decode perl-object (package does not exist)");
727
728 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
729
730 if (!method)
731 ERR ("cannot decode perl-object (package does not have a THAW method)");
732
733 dSP;
734
735 ENTER; SAVETMPS; PUSHMARK (SP);
736 EXTEND (SP, len + 1);
737 // we re-bless the reference to get overload and other niceties right
738 PUSHs (*av_fetch (av, 0, 1));
739 PUSHs (sv_cbor);
740
741 int i;
742
743 for (i = 1; i < len; ++i)
744 PUSHs (*av_fetch (av, i, 1));
745
746 PUTBACK;
747 call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
748 SPAGAIN;
749
750 if (SvTRUE (ERRSV))
751 {
752 FREETMPS; LEAVE;
753 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
754 }
755
756 SvREFCNT_dec (sv);
757 sv = SvREFCNT_inc (POPs);
758
759 PUTBACK;
760
761 FREETMPS; LEAVE;
762
763 return sv;
764 }
765 else
766 {
779 AV *av = newAV (); 767 AV *av = newAV ();
780 av_push (av, newSVuv (tag)); 768 av_push (av, newSVuv (tag));
781 av_push (av, sv); 769 av_push (av, sv);
782 return newRV_noinc ((SV *)av); 770
771 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
772 ? cbor_tagged_stash
773 : gv_stashpv ("CBOR::XS::Tagged" , 1);
774
775 return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
776 }
777
778fail:
779 SvREFCNT_dec (sv);
780 return &PL_sv_undef;
783} 781}
784 782
785static SV * 783static SV *
786decode_sv (dec_t *dec) 784decode_sv (dec_t *dec)
787{ 785{
788 WANT (1); 786 WANT (1);
789 787
790 switch (*dec->cur >> 5) 788 switch (*dec->cur >> 5)
791 { 789 {
792 case 0: // unsigned int 790 case 0: // unsigned int
793 //TODO: 64 bit values on 3 2bit perls
794 return newSVuv (decode_uint (dec)); 791 return newSVuv (decode_uint (dec));
795 case 1: // negative int 792 case 1: // negative int
796 return newSViv (-1 - (IV)decode_uint (dec)); 793 return newSViv (-1 - (IV)decode_uint (dec));
797 case 2: // octet string 794 case 2: // octet string
798 return decode_str (dec, 0); 795 return decode_str (dec, 0);
… …
807 case 7: // misc 804 case 7: // misc
808 switch (*dec->cur++ & 31) 805 switch (*dec->cur++ & 31)
809 { 806 {
810 case 20: 807 case 20:
811#if CBOR_SLOW 808#if CBOR_SLOW
812 cbor_false = get_bool ("CBOR::XS::false"); 809 types_false = get_bool ("Types::Serialiser::false");
813#endif 810#endif
814 return newSVsv (cbor_false); 811 return newSVsv (types_false);
815 case 21: 812 case 21:
816#if CBOR_SLOW 813#if CBOR_SLOW
817 cbor_true = get_bool ("CBOR::XS::true"); 814 types_true = get_bool ("Types::Serialiser::true");
818#endif 815#endif
819 return newSVsv (cbor_true); 816 return newSVsv (types_true);
820 case 22: 817 case 22:
821 return newSVsv (&PL_sv_undef); 818 return newSVsv (&PL_sv_undef);
819 case 23:
820#if CBOR_SLOW
821 types_error = get_bool ("Types::Serialiser::error");
822#endif
823 return newSVsv (types_error);
822 824
823 case 25: 825 case 25:
824 { 826 {
825 WANT (2); 827 WANT (2);
826 828
… …
862 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 864 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
863 } 865 }
864 866
865 break; 867 break;
866 } 868 }
867#if 0
868 switch (*dec->cur)
869 {
870 //case '"': ++dec->cur; return decode_str (dec);
871 case '[': ++dec->cur; return decode_av (dec);
872 case '{': ++dec->cur; return decode_hv (dec);
873
874 case '-':
875 case '0': case '1': case '2': case '3': case '4':
876 case '5': case '6': case '7': case '8': case '9':
877 //TODO return decode_num (dec);
878
879 case 't':
880 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
881 {
882 dec->cur += 4;
883#if CBOR_SLOW
884 cbor_true = get_bool ("CBOR::XS::true");
885#endif
886 return newSVsv (cbor_true);
887 }
888 else
889 ERR ("'true' expected");
890
891 break;
892
893 case 'f':
894 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
895 {
896 dec->cur += 5;
897#if CBOR_SLOW
898 cbor_false = get_bool ("CBOR::XS::false");
899#endif
900 return newSVsv (cbor_false);
901 }
902 else
903 ERR ("'false' expected");
904
905 break;
906
907 case 'n':
908 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
909 {
910 dec->cur += 4;
911 return newSVsv (&PL_sv_undef);
912 }
913 else
914 ERR ("'null' expected");
915
916 break;
917
918 default:
919 ERR ("malformed CBOR string, neither array, object, number, string or atom");
920 break;
921 }
922#endif
923 869
924fail: 870fail:
925 return &PL_sv_undef; 871 return &PL_sv_undef;
926} 872}
927 873
928static SV * 874static SV *
929decode_cbor (SV *string, CBOR *cbor, char **offset_return) 875decode_cbor (SV *string, CBOR *cbor, char **offset_return)
930{ 876{
931 dec_t dec; 877 dec_t dec;
932 SV *sv; 878 SV *sv;
879 STRLEN len;
880 char *data = SvPVbyte (string, len);
933 881
934 /* work around bugs in 5.10 where manipulating magic values
935 * makes perl ignore the magic in subsequent accesses.
936 * also make a copy of non-PV values, to get them into a clean
937 * state (SvPV should do that, but it's buggy, see below).
938 */
939 /*SvGETMAGIC (string);*/
940 if (SvMAGICAL (string) || !SvPOK (string))
941 string = sv_2mortal (newSVsv (string));
942
943 SvUPGRADE (string, SVt_PV);
944
945 /* work around a bug in perl 5.10, which causes SvCUR to fail an
946 * assertion with -DDEBUGGING, although SvCUR is documented to
947 * return the xpv_cur field which certainly exists after upgrading.
948 * according to nicholas clark, calling SvPOK fixes this.
949 * But it doesn't fix it, so try another workaround, call SvPV_nolen
950 * and hope for the best.
951 * Damnit, SvPV_nolen still trips over yet another assertion. This
952 * assertion business is seriously broken, try yet another workaround
953 * for the broken -DDEBUGGING.
954 */
955 {
956#ifdef DEBUGGING
957 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
958#else
959 STRLEN offset = SvCUR (string);
960#endif
961
962 if (offset > cbor->max_size && cbor->max_size) 882 if (len > cbor->max_size && cbor->max_size)
963 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu", 883 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
964 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 884 (unsigned long)len, (unsigned long)cbor->max_size);
965 }
966
967 sv_utf8_downgrade (string, 0);
968 885
969 dec.cbor = *cbor; 886 dec.cbor = *cbor;
970 dec.cur = (U8 *)SvPVX (string); 887 dec.cur = (U8 *)data;
971 dec.end = (U8 *)SvEND (string); 888 dec.end = (U8 *)data + len;
972 dec.err = 0; 889 dec.err = 0;
973 dec.depth = 0; 890 dec.depth = 0;
974
975 if (dec.cbor.cb_object || dec.cbor.cb_sk_object)
976 ;//TODO dec.cbor.flags |= F_HOOK;
977 891
978 sv = decode_sv (&dec); 892 sv = decode_sv (&dec);
979 893
980 if (offset_return) 894 if (offset_return)
981 *offset_return = dec.cur; 895 *offset_return = dec.cur;
… …
985 dec.err = "garbage after CBOR object"; 899 dec.err = "garbage after CBOR object";
986 900
987 if (dec.err) 901 if (dec.err)
988 { 902 {
989 SvREFCNT_dec (sv); 903 SvREFCNT_dec (sv);
990 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 904 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
991 } 905 }
992 906
993 sv = sv_2mortal (sv); 907 sv = sv_2mortal (sv);
994 908
995 return sv; 909 return sv;
… …
1001MODULE = CBOR::XS PACKAGE = CBOR::XS 915MODULE = CBOR::XS PACKAGE = CBOR::XS
1002 916
1003BOOT: 917BOOT:
1004{ 918{
1005 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 919 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1006 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1); 920 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1007 921
1008 cbor_true = get_bool ("CBOR::XS::true"); 922 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1009 cbor_false = get_bool ("CBOR::XS::false"); 923 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
924
925 types_true = get_bool ("Types::Serialiser::true" );
926 types_false = get_bool ("Types::Serialiser::false");
927 types_error = get_bool ("Types::Serialiser::error");
928
929 sv_cbor = newSVpv ("CBOR", 0);
930 SvREADONLY_on (sv_cbor);
1010} 931}
1011 932
1012PROTOTYPES: DISABLE 933PROTOTYPES: DISABLE
1013 934
1014void CLONE (...) 935void CLONE (...)
1015 CODE: 936 CODE:
1016 cbor_stash = 0; 937 cbor_stash = 0;
938 cbor_tagged_stash = 0;
939 types_error_stash = 0;
1017 cbor_boolean_stash = 0; 940 types_boolean_stash = 0;
1018 941
1019void new (char *klass) 942void new (char *klass)
1020 PPCODE: 943 PPCODE:
1021{ 944{
1022 SV *pv = NEWSV (0, sizeof (CBOR)); 945 SV *pv = NEWSV (0, sizeof (CBOR));
… …
1069 CODE: 992 CODE:
1070 RETVAL = self->max_size; 993 RETVAL = self->max_size;
1071 OUTPUT: 994 OUTPUT:
1072 RETVAL 995 RETVAL
1073 996
1074#if 0 //TODO
1075
1076void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
1077 PPCODE:
1078{
1079 SvREFCNT_dec (self->cb_object);
1080 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
1081
1082 XPUSHs (ST (0));
1083}
1084
1085void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef)
1086 PPCODE:
1087{
1088 if (!self->cb_sk_object)
1089 self->cb_sk_object = newHV ();
1090
1091 if (SvOK (cb))
1092 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1093 else
1094 {
1095 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1096
1097 if (!HvKEYS (self->cb_sk_object))
1098 {
1099 SvREFCNT_dec (self->cb_sk_object);
1100 self->cb_sk_object = 0;
1101 }
1102 }
1103
1104 XPUSHs (ST (0));
1105}
1106
1107#endif
1108
1109void encode (CBOR *self, SV *scalar) 997void encode (CBOR *self, SV *scalar)
1110 PPCODE: 998 PPCODE:
1111 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 999 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1112 XPUSHs (scalar); 1000 XPUSHs (scalar);
1113 1001
… …
1125 EXTEND (SP, 2); 1013 EXTEND (SP, 2);
1126 PUSHs (sv); 1014 PUSHs (sv);
1127 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1015 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1128} 1016}
1129 1017
1130void DESTROY (CBOR *self)
1131 CODE:
1132 SvREFCNT_dec (self->cb_sk_object);
1133 SvREFCNT_dec (self->cb_object);
1134
1135PROTOTYPES: ENABLE 1018PROTOTYPES: ENABLE
1136 1019
1137void encode_cbor (SV *scalar) 1020void encode_cbor (SV *scalar)
1138 PPCODE: 1021 PPCODE:
1139{ 1022{

Diff Legend

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