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.52 by root, Sun Apr 24 19:31:55 2016 UTC vs.
Revision 1.63 by root, Sat Nov 26 04:50:58 2016 UTC

… …
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
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#include <inttypes.h>
11 12
12#define ECB_NO_THREADS 1 13#define ECB_NO_THREADS 1
13#include "ecb.h" 14#include "ecb.h"
14 15
15// compatibility with perl <5.18 16// compatibility with perl <5.18
… …
20# define HvNAMELEN(hv) HvNAMELEN_get (hv) 21# define HvNAMELEN(hv) HvNAMELEN_get (hv)
21#endif 22#endif
22#ifndef HvNAMEUTF8 23#ifndef HvNAMEUTF8
23# define HvNAMEUTF8(hv) 0 24# define HvNAMEUTF8(hv) 0
24#endif 25#endif
26#ifndef SvREFCNT_inc_NN
27# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
28#endif
25#ifndef SvREFCNT_dec_NN 29#ifndef SvREFCNT_dec_NN
26# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv) 30# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
27#endif 31#endif
28 32
29// known major and minor types 33// known major and minor types
… …
99 103
100#define F_SHRINK 0x00000001UL 104#define F_SHRINK 0x00000001UL
101#define F_ALLOW_UNKNOWN 0x00000002UL 105#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL 106#define F_ALLOW_SHARING 0x00000004UL
103#define F_ALLOW_CYCLES 0x00000008UL 107#define F_ALLOW_CYCLES 0x00000008UL
108#define F_FORBID_OBJECTS 0x00000010UL
104#define F_PACK_STRINGS 0x00000010UL 109#define F_PACK_STRINGS 0x00000020UL
110#define F_TEXT_KEYS 0x00000040UL
105#define F_UTF8_STRINGS 0x00000020UL 111#define F_TEXT_STRINGS 0x00000080UL
106#define F_VALIDATE_UTF8 0x00000040UL 112#define F_VALIDATE_UTF8 0x00000100UL
107 113
108#define INIT_SIZE 32 // initial scalar size to be allocated 114#define INIT_SIZE 32 // initial scalar size to be allocated
109 115
110#define SB do { 116#define SB do {
111#define SE } while (0) 117#define SE } while (0)
… …
184 190
185// minimum length of a string to be registered for stringref 191// minimum length of a string to be registered for stringref
186ecb_inline int 192ecb_inline int
187minimum_string_length (UV idx) 193minimum_string_length (UV idx)
188{ 194{
189 return idx > 23 195 return idx <= 23 ? 3
190 ? idx > 0xffU 196 : idx <= 0xffU ? 4
191 ? idx > 0xffffU 197 : idx <= 0xffffU ? 5
192 ? idx > 0xffffffffU 198 : idx <= 0xffffffffU ? 7
193 ? 11 199 : 11;
194 : 7
195 : 5
196 : 4
197 : 3;
198} 200}
199 201
200///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
201// encoder 203// encoder
202 204
… …
215} enc_t; 217} enc_t;
216 218
217ecb_inline void 219ecb_inline void
218need (enc_t *enc, STRLEN len) 220need (enc_t *enc, STRLEN len)
219{ 221{
220 if (ecb_expect_false (enc->cur + len >= enc->end)) 222 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
221 { 223 {
222 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 224 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
223 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 225 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
224 enc->cur = SvPVX (enc->sv) + cur; 226 enc->cur = SvPVX (enc->sv) + cur;
225 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
277encode_tag (enc_t *enc, UV tag) 279encode_tag (enc_t *enc, UV tag)
278{ 280{
279 encode_uint (enc, MAJOR_TAG, tag); 281 encode_uint (enc, MAJOR_TAG, tag);
280} 282}
281 283
284// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
285ecb_noinline static void
286encode_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
282ecb_inline void 307ecb_inline void
283encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 308encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
284{ 309{
285 if (ecb_expect_false (enc->cbor.flags & F_UTF8_STRINGS)) 310 if (ecb_expect_false (upgrade_utf8))
286 if (!utf8) 311 if (!utf8)
287 { 312 {
288 // exceptional path for bytze strings that need to be utf8-encoded 313 encode_str_utf8 (enc, utf8, str, len);
289 STRLEN ulen = len;
290 U8 *p, *pend = (U8 *)str + len;
291
292 for (p = (U8 *)str; p < pend; ++p)
293 ulen += *p >> 7; // count set high bits
294
295 encode_uint (enc, MAJOR_TEXT, ulen);
296
297 need (enc, ulen);
298 for (p = (U8 *)str; p < pend; ++p)
299 if (*p < 0x80)
300 *enc->cur++ = *p;
301 else
302 {
303 *enc->cur++ = 0xc0 + (*p >> 6);
304 *enc->cur++ = 0x80 + (*p & 63);
305 }
306
307 return; 314 return;
308 } 315 }
309 316
310 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 317 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
311 need (enc, len); 318 need (enc, len);
312 memcpy (enc->cur, str, len); 319 memcpy (enc->cur, str, len);
313 enc->cur += len; 320 enc->cur += len;
314} 321}
315 322
316static void 323ecb_inline void
317encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 324encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
318{ 325{
319 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 326 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
320 { 327 {
321 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 328 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
322 329
… …
333 sv_setuv (*svp, enc->stringref_idx); 340 sv_setuv (*svp, enc->stringref_idx);
334 ++enc->stringref_idx; 341 ++enc->stringref_idx;
335 } 342 }
336 } 343 }
337 344
338 encode_str (enc, utf8, str, len); 345 encode_str (enc, upgrade_utf8, utf8, str, len);
339} 346}
340 347
341static void encode_sv (enc_t *enc, SV *sv); 348static void encode_sv (enc_t *enc, SV *sv);
342 349
343static void 350static void
… …
350 357
351 ++enc->depth; 358 ++enc->depth;
352 359
353 encode_uint (enc, MAJOR_ARRAY, len + 1); 360 encode_uint (enc, MAJOR_ARRAY, len + 1);
354 361
355 if (SvMAGICAL (av)) 362 if (ecb_expect_false (SvMAGICAL (av)))
356 for (i = 0; i <= len; ++i) 363 for (i = 0; i <= len; ++i)
357 { 364 {
358 SV **svp = av_fetch (av, i, 0); 365 SV **svp = av_fetch (av, i, 0);
359 encode_sv (enc, svp ? *svp : &PL_sv_undef); 366 encode_sv (enc, svp ? *svp : &PL_sv_undef);
360 } 367 }
… …
379 ++enc->depth; 386 ++enc->depth;
380 387
381 int pairs = hv_iterinit (hv); 388 int pairs = hv_iterinit (hv);
382 int mg = SvMAGICAL (hv); 389 int mg = SvMAGICAL (hv);
383 390
384 if (mg) 391 if (ecb_expect_false (mg))
385 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
386 else 393 else
387 encode_uint (enc, MAJOR_MAP, pairs); 394 encode_uint (enc, MAJOR_MAP, pairs);
388 395
389 while ((he = hv_iternext (hv))) 396 while ((he = hv_iternext (hv)))
390 { 397 {
391 if (HeKLEN (he) == HEf_SVKEY) 398 if (HeKLEN (he) == HEf_SVKEY)
392 encode_sv (enc, HeSVKEY (he)); 399 encode_sv (enc, HeSVKEY (he));
393 else 400 else
394 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));
395 402
396 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));
397 } 404 }
398 405
399 if (mg) 406 if (ecb_expect_false (mg))
400 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
401 408
402 --enc->depth; 409 --enc->depth;
403} 410}
404 411
… …
447 } 454 }
448 455
449 if (ecb_expect_false (SvREFCNT (sv) > 1) 456 if (ecb_expect_false (SvREFCNT (sv) > 1)
450 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 457 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
451 { 458 {
452 if (!enc->shareable) 459 if (ecb_expect_false (!enc->shareable))
453 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 460 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
454 461
455 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 462 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
456 463
457 if (SvOK (*svp)) 464 if (SvOK (*svp))
… …
471 if (ecb_expect_false (SvOBJECT (sv))) 478 if (ecb_expect_false (SvOBJECT (sv)))
472 { 479 {
473 HV *stash = SvSTASH (sv); 480 HV *stash = SvSTASH (sv);
474 GV *method; 481 GV *method;
475 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))));
476 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 486 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
477 { 487 {
478 dSP; 488 dSP;
479 489
480 ENTER; SAVETMPS; 490 ENTER; SAVETMPS;
481 PUSHMARK (SP); 491 PUSHMARK (SP);
… …
517 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 527 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
518 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));
519 529
520 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 530 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
521 encode_uint (enc, MAJOR_ARRAY, count + 1); 531 encode_uint (enc, MAJOR_ARRAY, count + 1);
522 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 532 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
523 533
524 while (count) 534 while (count)
525 encode_sv (enc, SP[1 - count--]); 535 encode_sv (enc, SP[1 - count--]);
526 536
527 PUTBACK; 537 PUTBACK;
… …
553 if (ecb_expect_false (nv == (NV)(U32)nv)) 563 if (ecb_expect_false (nv == (NV)(U32)nv))
554 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 564 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
555 //TODO: maybe I32? 565 //TODO: maybe I32?
556 else if (ecb_expect_false (nv == (float)nv)) 566 else if (ecb_expect_false (nv == (float)nv))
557 { 567 {
568 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
569
558 uint32_t fp = ecb_float_to_binary32 (nv); 570 uint32_t fp = ecb_float_to_binary32 (nv);
559
560 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
561 571
562 if (!ecb_big_endian ()) 572 if (!ecb_big_endian ())
563 fp = ecb_bswap32 (fp); 573 fp = ecb_bswap32 (fp);
564 574
565 memcpy (enc->cur, &fp, 4); 575 memcpy (enc->cur, &fp, 4);
566 enc->cur += 4; 576 enc->cur += 4;
567 } 577 }
568 else 578 else
569 { 579 {
580 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
581
570 uint64_t fp = ecb_double_to_binary64 (nv); 582 uint64_t fp = ecb_double_to_binary64 (nv);
571
572 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
573 583
574 if (!ecb_big_endian ()) 584 if (!ecb_big_endian ())
575 fp = ecb_bswap64 (fp); 585 fp = ecb_bswap64 (fp);
576 586
577 memcpy (enc->cur, &fp, 8); 587 memcpy (enc->cur, &fp, 8);
… …
586 596
587 if (SvPOKp (sv)) 597 if (SvPOKp (sv))
588 { 598 {
589 STRLEN len; 599 STRLEN len;
590 char *str = SvPV (sv, len); 600 char *str = SvPV (sv, len);
591 encode_strref (enc, SvUTF8 (sv), str, len); 601 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
592 } 602 }
593 else if (SvNOKp (sv)) 603 else if (SvNOKp (sv))
594 encode_nv (enc, sv); 604 encode_nv (enc, sv);
595 else if (SvIOKp (sv)) 605 else if (SvIOKp (sv))
596 { 606 {
… …
615static SV * 625static SV *
616encode_cbor (SV *scalar, CBOR *cbor) 626encode_cbor (SV *scalar, CBOR *cbor)
617{ 627{
618 enc_t enc = { 0 }; 628 enc_t enc = { 0 };
619 629
620 enc.cbor = *cbor; 630 enc.cbor = *cbor;
621 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 631 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
622 enc.cur = SvPVX (enc.sv); 632 enc.cur = SvPVX (enc.sv);
623 enc.end = SvEND (enc.sv); 633 enc.end = SvEND (enc.sv);
624 634
625 SvPOK_only (enc.sv); 635 SvPOK_only (enc.sv);
626 636
627 if (cbor->flags & F_PACK_STRINGS) 637 if (cbor->flags & F_PACK_STRINGS)
628 { 638 {
… …
655 U32 depth; // recursion depth 665 U32 depth; // recursion depth
656 U32 maxdepth; // recursion depth limit 666 U32 maxdepth; // recursion depth limit
657 AV *shareable; 667 AV *shareable;
658 AV *stringref; 668 AV *stringref;
659 SV *decode_tagged; 669 SV *decode_tagged;
670 SV *err_sv; // optional sv for error, needs to be freed
660} dec_t; 671} dec_t;
661 672
662#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 673// set dec->err to ERRSV
674ecb_cold static void
675err_errsv (dec_t *dec)
676{
677 if (!dec->err)
678 {
679 dec->err_sv = newSVsv (ERRSV);
663 680
664#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;
665 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
690ecb_cold static void
691err_set (dec_t *dec, const char *reason)
692{
693 if (!dec->err)
694 dec->err = reason;
695}
696
697ecb_cold static void
698err_unexpected_end (dec_t *dec)
699{
700 err_set (dec, "unexpected end of CBOR data");
701}
702
703#define ERR_DO(do) SB do; goto fail; SE
704#define ERR(reason) ERR_DO (err_set (dec, reason))
705#define ERR_ERRSV ERR_DO (err_errsv (dec))
706
707#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
708
666#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 709#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
667#define DEC_DEC_DEPTH --dec->depth 710#define DEC_DEC_DEPTH --dec->depth
668 711
669static UV 712static UV
670decode_uint (dec_t *dec) 713decode_uint (dec_t *dec)
671{ 714{
… …
748 av_push (av, decode_sv (dec)); 791 av_push (av, decode_sv (dec));
749 } 792 }
750 } 793 }
751 else 794 else
752 { 795 {
753 int i, len = decode_uint (dec); 796 UV i, len = decode_uint (dec);
754 797
755 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 798 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
756 av_fill (av, len - 1); 799 av_fill (av, len - 1);
757 800
758 for (i = 0; i < len; ++i) 801 for (i = 0; i < len; ++i)
… …
761 804
762 DEC_DEC_DEPTH; 805 DEC_DEC_DEPTH;
763 return newRV_noinc ((SV *)av); 806 return newRV_noinc ((SV *)av);
764 807
765fail: 808fail:
766 SvREFCNT_dec (av); 809 SvREFCNT_dec_NN (av);
767 DEC_DEC_DEPTH; 810 DEC_DEC_DEPTH;
768 return &PL_sv_undef; 811 return &PL_sv_undef;
769} 812}
770 813
771static void 814static void
… …
775 // byte or utf-8 strings as keys, but only when !stringref 818 // byte or utf-8 strings as keys, but only when !stringref
776 819
777 if (ecb_expect_true (!dec->stringref)) 820 if (ecb_expect_true (!dec->stringref))
778 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 821 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
779 { 822 {
780 I32 len = decode_uint (dec); 823 STRLEN len = decode_uint (dec);
781 char *key = (char *)dec->cur; 824 char *key = (char *)dec->cur;
782 825
783 WANT (len); 826 WANT (len);
784 dec->cur += len; 827 dec->cur += len;
785 828
… …
787 830
788 return; 831 return;
789 } 832 }
790 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 833 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
791 { 834 {
792 I32 len = decode_uint (dec); 835 STRLEN len = decode_uint (dec);
793 char *key = (char *)dec->cur; 836 char *key = (char *)dec->cur;
794 837
795 WANT (len); 838 WANT (len);
796 dec->cur += len; 839 dec->cur += len;
797 840
… …
805 } 848 }
806 849
807 SV *k = decode_sv (dec); 850 SV *k = decode_sv (dec);
808 SV *v = decode_sv (dec); 851 SV *v = decode_sv (dec);
809 852
853 // we leak memory if uncaught exceptions are thrown by random magical
854 // methods, and this is hopefully the only place where it can happen,
855 // so if there is a chance of an exception, take the very slow path.
856 // since catching exceptions is "undocumented/internal/forbidden" by
857 // the new p5p powers, we need to call out to a perl function :/
858 if (ecb_expect_false (SvAMAGIC (k)))
859 {
860 dSP;
861
862 ENTER; SAVETMPS;
863 PUSHMARK (SP);
864 EXTEND (SP, 3);
865 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
866 PUSHs (sv_2mortal (k));
867 PUSHs (sv_2mortal (v));
868
869 PUTBACK;
870 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
871 SPAGAIN;
872
873 FREETMPS; LEAVE;
874
875 if (SvTRUE (ERRSV))
876 ERR_ERRSV;
877
878 return;
879 }
880
810 hv_store_ent (hv, k, v, 0); 881 hv_store_ent (hv, k, v, 0);
811 SvREFCNT_dec (k); 882 SvREFCNT_dec_NN (k);
812 883
813fail: 884fail:
814 ; 885 ;
815} 886}
816 887
… …
838 decode_he (dec, hv); 909 decode_he (dec, hv);
839 } 910 }
840 } 911 }
841 else 912 else
842 { 913 {
843 int pairs = decode_uint (dec); 914 UV pairs = decode_uint (dec);
915
916 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
844 917
845 while (pairs--) 918 while (pairs--)
846 decode_he (dec, hv); 919 decode_he (dec, hv);
847 } 920 }
848 921
849 DEC_DEC_DEPTH; 922 DEC_DEC_DEPTH;
850 return newRV_noinc ((SV *)hv); 923 return newRV_noinc ((SV *)hv);
851 924
852fail: 925fail:
853 SvREFCNT_dec (hv); 926 SvREFCNT_dec_NN (hv);
854 DEC_DEC_DEPTH; 927 DEC_DEC_DEPTH;
855 return &PL_sv_undef; 928 return &PL_sv_undef;
856} 929}
857 930
858static SV * 931static SV *
859decode_str (dec_t *dec, int utf8) 932decode_str (dec_t *dec, int utf8)
860{ 933{
861 SV *sv = 0; 934 SV *sv = 0;
862 935
863 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 936 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
864 { 937 {
865 // indefinite length strings 938 // indefinite length strings
866 ++dec->cur; 939 ++dec->cur;
867 940
868 U8 major = *dec->cur & MAJOR_MISC; 941 U8 major = *dec->cur & MAJOR_MISC;
… …
936 sv = newRV_noinc (decode_sv (dec)); 1009 sv = newRV_noinc (decode_sv (dec));
937 break; 1010 break;
938 1011
939 case CBOR_TAG_STRINGREF_NAMESPACE: 1012 case CBOR_TAG_STRINGREF_NAMESPACE:
940 { 1013 {
1014 // do not use SAVETMPS/FREETMPS, as these will
1015 // erase mortalised caches, e.g. "shareable"
941 ENTER; SAVETMPS; 1016 ENTER;
942 1017
943 SAVESPTR (dec->stringref); 1018 SAVESPTR (dec->stringref);
944 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1019 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
945 1020
946 sv = decode_sv (dec); 1021 sv = decode_sv (dec);
947 1022
948 FREETMPS; LEAVE; 1023 LEAVE;
949 } 1024 }
950 break; 1025 break;
951 1026
952 case CBOR_TAG_STRINGREF: 1027 case CBOR_TAG_STRINGREF:
953 { 1028 {
… …
1004 } 1079 }
1005 break; 1080 break;
1006 1081
1007 case CBOR_TAG_PERL_OBJECT: 1082 case CBOR_TAG_PERL_OBJECT:
1008 { 1083 {
1084 if (dec->cbor.flags & F_FORBID_OBJECTS)
1085 goto filter;
1086
1009 sv = decode_sv (dec); 1087 sv = decode_sv (dec);
1010 1088
1011 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1089 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1012 ERR ("corrupted CBOR data (non-array perl object)"); 1090 ERR ("corrupted CBOR data (non-array perl object)");
1013 1091
… …
1042 SPAGAIN; 1120 SPAGAIN;
1043 1121
1044 if (SvTRUE (ERRSV)) 1122 if (SvTRUE (ERRSV))
1045 { 1123 {
1046 FREETMPS; LEAVE; 1124 FREETMPS; LEAVE;
1047 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1125 ERR_ERRSV;
1048 } 1126 }
1049 1127
1050 SvREFCNT_dec (sv); 1128 SvREFCNT_dec_NN (sv);
1051 sv = SvREFCNT_inc (POPs); 1129 sv = SvREFCNT_inc (POPs);
1052 1130
1053 PUTBACK; 1131 PUTBACK;
1054 1132
1055 FREETMPS; LEAVE; 1133 FREETMPS; LEAVE;
1056 } 1134 }
1057 break; 1135 break;
1058 1136
1059 default: 1137 default:
1138 filter:
1060 { 1139 {
1140 SV *tag_sv = newSVuv (tag);
1141
1061 sv = decode_sv (dec); 1142 sv = decode_sv (dec);
1062 1143
1063 dSP; 1144 dSP;
1064 ENTER; SAVETMPS; 1145 ENTER; SAVETMPS;
1065 SAVESTACK_POS (); 1146 SAVESTACK_POS ();
1066 PUSHMARK (SP); 1147 PUSHMARK (SP);
1067 EXTEND (SP, 2); 1148 EXTEND (SP, 2);
1068 PUSHs (newSVuv (tag)); 1149 PUSHs (tag_sv);
1069 PUSHs (sv); 1150 PUSHs (sv);
1070 1151
1071 PUTBACK; 1152 PUTBACK;
1072 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1153 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1073 SPAGAIN; 1154 SPAGAIN;
1074 1155
1075 if (SvTRUE (ERRSV)) 1156 if (SvTRUE (ERRSV))
1076 { 1157 {
1158 SvREFCNT_dec_NN (tag_sv);
1077 FREETMPS; LEAVE; 1159 FREETMPS; LEAVE;
1078 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1160 ERR_ERRSV;
1079 } 1161 }
1080 1162
1081 if (count) 1163 if (count)
1082 { 1164 {
1165 SvREFCNT_dec_NN (tag_sv);
1083 SvREFCNT_dec (sv); 1166 SvREFCNT_dec_NN (sv);
1084 sv = SvREFCNT_inc (POPs); 1167 sv = SvREFCNT_inc_NN (POPs);
1085 } 1168 }
1086 else 1169 else
1087 { 1170 {
1088 AV *av = newAV (); 1171 AV *av = newAV ();
1089 av_push (av, newSVuv (tag)); 1172 av_push (av, tag_sv);
1090 av_push (av, sv); 1173 av_push (av, sv);
1091 1174
1092 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1175 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1093 ? cbor_tagged_stash 1176 ? cbor_tagged_stash
1094 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1177 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1223 1306
1224 if (dec.err) 1307 if (dec.err)
1225 { 1308 {
1226 if (dec.shareable) 1309 if (dec.shareable)
1227 { 1310 {
1228 // need to break cyclic links, which whould all be in shareable 1311 // need to break cyclic links, which would all be in shareable
1229 int i; 1312 int i;
1230 SV **svp; 1313 SV **svp;
1231 1314
1232 for (i = av_len (dec.shareable) + 1; i--; ) 1315 for (i = av_len (dec.shareable) + 1; i--; )
1233 if ((svp = av_fetch (dec.shareable, i, 0))) 1316 if ((svp = av_fetch (dec.shareable, i, 0)))
1234 sv_setsv (*svp, &PL_sv_undef); 1317 sv_setsv (*svp, &PL_sv_undef);
1235 } 1318 }
1236 1319
1237 SvREFCNT_dec (sv); 1320 SvREFCNT_dec_NN (sv);
1321
1322 if (dec.err_sv)
1323 sv_2mortal (dec.err_sv);
1324
1238 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1325 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1239 } 1326 }
1240 1327
1241 sv = sv_2mortal (sv); 1328 sv = sv_2mortal (sv);
1242 1329
… …
1386 1473
1387 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1474 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1388 1475
1389 sv_cbor = newSVpv ("CBOR", 0); 1476 sv_cbor = newSVpv ("CBOR", 0);
1390 SvREADONLY_on (sv_cbor); 1477 SvREADONLY_on (sv_cbor);
1478
1479 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1391} 1480}
1392 1481
1393PROTOTYPES: DISABLE 1482PROTOTYPES: DISABLE
1394 1483
1395void CLONE (...) 1484void CLONE (...)
… …
1415 ALIAS: 1504 ALIAS:
1416 shrink = F_SHRINK 1505 shrink = F_SHRINK
1417 allow_unknown = F_ALLOW_UNKNOWN 1506 allow_unknown = F_ALLOW_UNKNOWN
1418 allow_sharing = F_ALLOW_SHARING 1507 allow_sharing = F_ALLOW_SHARING
1419 allow_cycles = F_ALLOW_CYCLES 1508 allow_cycles = F_ALLOW_CYCLES
1509 forbid_objects = F_FORBID_OBJECTS
1420 pack_strings = F_PACK_STRINGS 1510 pack_strings = F_PACK_STRINGS
1511 text_keys = F_TEXT_KEYS
1421 utf8_strings = F_UTF8_STRINGS 1512 text_strings = F_TEXT_STRINGS
1422 validate_utf8 = F_VALIDATE_UTF8 1513 validate_utf8 = F_VALIDATE_UTF8
1423 PPCODE: 1514 PPCODE:
1424{ 1515{
1425 if (enable) 1516 if (enable)
1426 self->flags |= ix; 1517 self->flags |= ix;
… …
1434 ALIAS: 1525 ALIAS:
1435 get_shrink = F_SHRINK 1526 get_shrink = F_SHRINK
1436 get_allow_unknown = F_ALLOW_UNKNOWN 1527 get_allow_unknown = F_ALLOW_UNKNOWN
1437 get_allow_sharing = F_ALLOW_SHARING 1528 get_allow_sharing = F_ALLOW_SHARING
1438 get_allow_cycles = F_ALLOW_CYCLES 1529 get_allow_cycles = F_ALLOW_CYCLES
1530 get_forbid_objects = F_FORBID_OBJECTS
1439 get_pack_strings = F_PACK_STRINGS 1531 get_pack_strings = F_PACK_STRINGS
1532 get_text_keys = F_TEXT_KEYS
1533 get_text_strings = F_TEXT_STRINGS
1440 get_validate_utf8 = F_VALIDATE_UTF8 1534 get_validate_utf8 = F_VALIDATE_UTF8
1441 PPCODE: 1535 PPCODE:
1442 XPUSHs (boolSV (self->flags & ix)); 1536 XPUSHs (boolSV (self->flags & ix));
1443 1537
1444void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1538void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)

Diff Legend

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