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.36 by root, Sat Nov 30 17:37:45 2013 UTC vs.
Revision 1.65 by root, Thu Nov 15 19:52:41 2018 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
13#define ECB_NO_THREADS 1
12#include "ecb.h" 14#include "ecb.h"
13 15
14// compatibility with perl <5.18 16// compatibility with perl <5.18
15#ifndef HvNAMELEN_get 17#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv)) 18# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
… …
19# define HvNAMELEN(hv) HvNAMELEN_get (hv) 21# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20#endif 22#endif
21#ifndef HvNAMEUTF8 23#ifndef HvNAMEUTF8
22# define HvNAMEUTF8(hv) 0 24# define HvNAMEUTF8(hv) 0
23#endif 25#endif
26#ifndef SvREFCNT_inc_NN
27# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
28#endif
24#ifndef SvREFCNT_dec_NN 29#ifndef SvREFCNT_dec_NN
25# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv) 30# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
26#endif 31#endif
27 32
28// known major and minor types 33// known major and minor types
… …
97}; 102};
98 103
99#define F_SHRINK 0x00000001UL 104#define F_SHRINK 0x00000001UL
100#define F_ALLOW_UNKNOWN 0x00000002UL 105#define F_ALLOW_UNKNOWN 0x00000002UL
101#define F_ALLOW_SHARING 0x00000004UL 106#define F_ALLOW_SHARING 0x00000004UL
107#define F_ALLOW_CYCLES 0x00000008UL
108#define F_FORBID_OBJECTS 0x00000010UL
102#define F_PACK_STRINGS 0x00000008UL 109#define F_PACK_STRINGS 0x00000020UL
110#define F_TEXT_KEYS 0x00000040UL
111#define F_TEXT_STRINGS 0x00000080UL
112#define F_VALIDATE_UTF8 0x00000100UL
103 113
104#define INIT_SIZE 32 // initial scalar size to be allocated 114#define INIT_SIZE 32 // initial scalar size to be allocated
105 115
106#define SB do { 116#define SB do {
107#define SE } while (0) 117#define SE } while (0)
… …
126typedef struct { 136typedef struct {
127 U32 flags; 137 U32 flags;
128 U32 max_depth; 138 U32 max_depth;
129 STRLEN max_size; 139 STRLEN max_size;
130 SV *filter; 140 SV *filter;
141
142 // for the incremental parser
143 STRLEN incr_pos; // the current offset into the text
144 STRLEN incr_need; // minimum bytes needed to decode
145 AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
131} CBOR; 146} CBOR;
132 147
133ecb_inline void 148ecb_inline void
134cbor_init (CBOR *cbor) 149cbor_init (CBOR *cbor)
135{ 150{
… …
139 154
140ecb_inline void 155ecb_inline void
141cbor_free (CBOR *cbor) 156cbor_free (CBOR *cbor)
142{ 157{
143 SvREFCNT_dec (cbor->filter); 158 SvREFCNT_dec (cbor->filter);
159 SvREFCNT_dec (cbor->incr_count);
144} 160}
145 161
146///////////////////////////////////////////////////////////////////////////// 162/////////////////////////////////////////////////////////////////////////////
147// utility functions 163// utility functions
148 164
… …
174 190
175// minimum length of a string to be registered for stringref 191// minimum length of a string to be registered for stringref
176ecb_inline int 192ecb_inline int
177minimum_string_length (UV idx) 193minimum_string_length (UV idx)
178{ 194{
179 return idx > 23 195 return idx <= 23 ? 3
180 ? idx > 0xffU 196 : idx <= 0xffU ? 4
181 ? idx > 0xffffU 197 : idx <= 0xffffU ? 5
182 ? idx > 0xffffffffU 198 : idx <= 0xffffffffU ? 7
183 ? 11 199 : 11;
184 : 7
185 : 5
186 : 4
187 : 3;
188} 200}
189 201
190///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
191// encoder 203// encoder
192 204
… …
205} enc_t; 217} enc_t;
206 218
207ecb_inline void 219ecb_inline void
208need (enc_t *enc, STRLEN len) 220need (enc_t *enc, STRLEN len)
209{ 221{
210 if (ecb_expect_false (enc->cur + len >= enc->end)) 222 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
211 { 223 {
212 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 224 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
213 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 225 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
214 enc->cur = SvPVX (enc->sv) + cur; 226 enc->cur = SvPVX (enc->sv) + cur;
215 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
267encode_tag (enc_t *enc, UV tag) 279encode_tag (enc_t *enc, UV tag)
268{ 280{
269 encode_uint (enc, MAJOR_TAG, tag); 281 encode_uint (enc, MAJOR_TAG, tag);
270} 282}
271 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
272ecb_inline void 307ecb_inline void
273encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 308encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
274{ 309{
310 if (ecb_expect_false (upgrade_utf8))
311 if (!utf8)
312 {
313 encode_str_utf8 (enc, utf8, str, len);
314 return;
315 }
316
275 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 317 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
276 need (enc, len); 318 need (enc, len);
277 memcpy (enc->cur, str, len); 319 memcpy (enc->cur, str, len);
278 enc->cur += len; 320 enc->cur += len;
279} 321}
280 322
281static void 323ecb_inline void
282encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 324encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
283{ 325{
284 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 326 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
285 { 327 {
286 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 328 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
287 329
… …
298 sv_setuv (*svp, enc->stringref_idx); 340 sv_setuv (*svp, enc->stringref_idx);
299 ++enc->stringref_idx; 341 ++enc->stringref_idx;
300 } 342 }
301 } 343 }
302 344
303 encode_str (enc, utf8, str, len); 345 encode_str (enc, upgrade_utf8, utf8, str, len);
304} 346}
305 347
306static void encode_sv (enc_t *enc, SV *sv); 348static void encode_sv (enc_t *enc, SV *sv);
307 349
308static void 350static void
… …
315 357
316 ++enc->depth; 358 ++enc->depth;
317 359
318 encode_uint (enc, MAJOR_ARRAY, len + 1); 360 encode_uint (enc, MAJOR_ARRAY, len + 1);
319 361
362 if (ecb_expect_false (SvMAGICAL (av)))
320 for (i = 0; i <= len; ++i) 363 for (i = 0; i <= len; ++i)
321 { 364 {
322 SV **svp = av_fetch (av, i, 0); 365 SV **svp = av_fetch (av, i, 0);
323 encode_sv (enc, svp ? *svp : &PL_sv_undef); 366 encode_sv (enc, svp ? *svp : &PL_sv_undef);
324 } 367 }
368 else
369 for (i = 0; i <= len; ++i)
370 {
371 SV *sv = AvARRAY (av)[i];
372 encode_sv (enc, sv ? sv : &PL_sv_undef);
373 }
325 374
326 --enc->depth; 375 --enc->depth;
327} 376}
328 377
329static void 378static void
… …
337 ++enc->depth; 386 ++enc->depth;
338 387
339 int pairs = hv_iterinit (hv); 388 int pairs = hv_iterinit (hv);
340 int mg = SvMAGICAL (hv); 389 int mg = SvMAGICAL (hv);
341 390
342 if (mg) 391 if (ecb_expect_false (mg))
343 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
344 else 393 else
345 encode_uint (enc, MAJOR_MAP, pairs); 394 encode_uint (enc, MAJOR_MAP, pairs);
346 395
347 while ((he = hv_iternext (hv))) 396 while ((he = hv_iternext (hv)))
348 { 397 {
349 if (HeKLEN (he) == HEf_SVKEY) 398 if (HeKLEN (he) == HEf_SVKEY)
350 encode_sv (enc, HeSVKEY (he)); 399 encode_sv (enc, HeSVKEY (he));
351 else 400 else
352 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));
353 402
354 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));
355 } 404 }
356 405
357 if (mg) 406 if (ecb_expect_false (mg))
358 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
359 408
360 --enc->depth; 409 --enc->depth;
361} 410}
362 411
… …
405 } 454 }
406 455
407 if (ecb_expect_false (SvREFCNT (sv) > 1) 456 if (ecb_expect_false (SvREFCNT (sv) > 1)
408 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 457 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
409 { 458 {
410 if (!enc->shareable) 459 if (ecb_expect_false (!enc->shareable))
411 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 460 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
412 461
413 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 462 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
414 463
415 if (SvOK (*svp)) 464 if (SvOK (*svp))
… …
429 if (ecb_expect_false (SvOBJECT (sv))) 478 if (ecb_expect_false (SvOBJECT (sv)))
430 { 479 {
431 HV *stash = SvSTASH (sv); 480 HV *stash = SvSTASH (sv);
432 GV *method; 481 GV *method;
433 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))));
434 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 486 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
435 { 487 {
436 dSP; 488 dSP;
437 489
438 ENTER; SAVETMPS; PUSHMARK (SP); 490 ENTER; SAVETMPS;
491 PUSHMARK (SP);
439 // 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
440 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 493 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
441 494
442 PUTBACK; 495 PUTBACK;
443 // G_SCALAR ensures that return value is 1 496 // G_SCALAR ensures that return value is 1
… …
456 } 509 }
457 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
458 { 511 {
459 dSP; 512 dSP;
460 513
461 ENTER; SAVETMPS; PUSHMARK (SP); 514 ENTER; SAVETMPS;
515 PUSHMARK (SP);
462 EXTEND (SP, 2); 516 EXTEND (SP, 2);
463 // we re-bless the reference to get overload and other niceties right 517 // we re-bless the reference to get overload and other niceties right
464 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 518 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
465 PUSHs (sv_cbor); 519 PUSHs (sv_cbor);
466 520
… …
472 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 526 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
473 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 527 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
474 528
475 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 529 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
476 encode_uint (enc, MAJOR_ARRAY, count + 1); 530 encode_uint (enc, MAJOR_ARRAY, count + 1);
477 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 531 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
478 532
479 while (count) 533 {
534 int i;
535
536 for (i = 0; i < count; ++i)
480 encode_sv (enc, SP[1 - count--]); 537 encode_sv (enc, SP[i + 1 - count]);
538
539 SP -= count;
540 }
481 541
482 PUTBACK; 542 PUTBACK;
483 543
484 FREETMPS; LEAVE; 544 FREETMPS; LEAVE;
485 } 545 }
… …
508 if (ecb_expect_false (nv == (NV)(U32)nv)) 568 if (ecb_expect_false (nv == (NV)(U32)nv))
509 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 569 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
510 //TODO: maybe I32? 570 //TODO: maybe I32?
511 else if (ecb_expect_false (nv == (float)nv)) 571 else if (ecb_expect_false (nv == (float)nv))
512 { 572 {
573 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
574
513 uint32_t fp = ecb_float_to_binary32 (nv); 575 uint32_t fp = ecb_float_to_binary32 (nv);
514
515 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
516 576
517 if (!ecb_big_endian ()) 577 if (!ecb_big_endian ())
518 fp = ecb_bswap32 (fp); 578 fp = ecb_bswap32 (fp);
519 579
520 memcpy (enc->cur, &fp, 4); 580 memcpy (enc->cur, &fp, 4);
521 enc->cur += 4; 581 enc->cur += 4;
522 } 582 }
523 else 583 else
524 { 584 {
585 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
586
525 uint64_t fp = ecb_double_to_binary64 (nv); 587 uint64_t fp = ecb_double_to_binary64 (nv);
526
527 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
528 588
529 if (!ecb_big_endian ()) 589 if (!ecb_big_endian ())
530 fp = ecb_bswap64 (fp); 590 fp = ecb_bswap64 (fp);
531 591
532 memcpy (enc->cur, &fp, 8); 592 memcpy (enc->cur, &fp, 8);
… …
541 601
542 if (SvPOKp (sv)) 602 if (SvPOKp (sv))
543 { 603 {
544 STRLEN len; 604 STRLEN len;
545 char *str = SvPV (sv, len); 605 char *str = SvPV (sv, len);
546 encode_strref (enc, SvUTF8 (sv), str, len); 606 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
547 } 607 }
548 else if (SvNOKp (sv)) 608 else if (SvNOKp (sv))
549 encode_nv (enc, sv); 609 encode_nv (enc, sv);
550 else if (SvIOKp (sv)) 610 else if (SvIOKp (sv))
551 { 611 {
… …
568} 628}
569 629
570static SV * 630static SV *
571encode_cbor (SV *scalar, CBOR *cbor) 631encode_cbor (SV *scalar, CBOR *cbor)
572{ 632{
573 enc_t enc = { }; 633 enc_t enc = { 0 };
574 634
575 enc.cbor = *cbor; 635 enc.cbor = *cbor;
576 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 636 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
577 enc.cur = SvPVX (enc.sv); 637 enc.cur = SvPVX (enc.sv);
578 enc.end = SvEND (enc.sv); 638 enc.end = SvEND (enc.sv);
579 639
580 SvPOK_only (enc.sv); 640 SvPOK_only (enc.sv);
581 641
582 if (cbor->flags & F_PACK_STRINGS) 642 if (cbor->flags & F_PACK_STRINGS)
583 { 643 {
… …
610 U32 depth; // recursion depth 670 U32 depth; // recursion depth
611 U32 maxdepth; // recursion depth limit 671 U32 maxdepth; // recursion depth limit
612 AV *shareable; 672 AV *shareable;
613 AV *stringref; 673 AV *stringref;
614 SV *decode_tagged; 674 SV *decode_tagged;
675 SV *err_sv; // optional sv for error, needs to be freed
615} dec_t; 676} dec_t;
616 677
617#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 678// set dec->err to ERRSV
679ecb_cold static void
680err_errsv (dec_t *dec)
681{
682 if (!dec->err)
683 {
684 dec->err_sv = newSVsv (ERRSV);
618 685
619#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 686 // chop off the trailing \n
687 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
688 *SvEND (dec->err_sv) = 0;
620 689
690 dec->err = SvPVutf8_nolen (dec->err_sv);
691 }
692}
693
694// the following functions are used to reduce code size and help the compiler to optimise
695ecb_cold static void
696err_set (dec_t *dec, const char *reason)
697{
698 if (!dec->err)
699 dec->err = reason;
700}
701
702ecb_cold static void
703err_unexpected_end (dec_t *dec)
704{
705 err_set (dec, "unexpected end of CBOR data");
706}
707
708#define ERR_DO(do) SB do; goto fail; SE
709#define ERR(reason) ERR_DO (err_set (dec, reason))
710#define ERR_ERRSV ERR_DO (err_errsv (dec))
711
712#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
713
621#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 714#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
622#define DEC_DEC_DEPTH --dec->depth 715#define DEC_DEC_DEPTH --dec->depth
623 716
624static UV 717static UV
625decode_uint (dec_t *dec) 718decode_uint (dec_t *dec)
626{ 719{
… …
692 785
693 for (;;) 786 for (;;)
694 { 787 {
695 WANT (1); 788 WANT (1);
696 789
697 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 790 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
698 { 791 {
699 ++dec->cur; 792 ++dec->cur;
700 break; 793 break;
701 } 794 }
702 795
703 av_push (av, decode_sv (dec)); 796 av_push (av, decode_sv (dec));
704 } 797 }
705 } 798 }
706 else 799 else
707 { 800 {
708 int i, len = decode_uint (dec); 801 UV i, len = decode_uint (dec);
709 802
710 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 803 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
711 av_fill (av, len - 1); 804 av_fill (av, len - 1);
712 805
713 for (i = 0; i < len; ++i) 806 for (i = 0; i < len; ++i)
… …
716 809
717 DEC_DEC_DEPTH; 810 DEC_DEC_DEPTH;
718 return newRV_noinc ((SV *)av); 811 return newRV_noinc ((SV *)av);
719 812
720fail: 813fail:
721 SvREFCNT_dec (av); 814 SvREFCNT_dec_NN (av);
722 DEC_DEC_DEPTH; 815 DEC_DEC_DEPTH;
723 return &PL_sv_undef; 816 return &PL_sv_undef;
724} 817}
725 818
726static void 819static void
… …
728{ 821{
729 // for speed reasons, we specialcase single-string 822 // for speed reasons, we specialcase single-string
730 // byte or utf-8 strings as keys, but only when !stringref 823 // byte or utf-8 strings as keys, but only when !stringref
731 824
732 if (ecb_expect_true (!dec->stringref)) 825 if (ecb_expect_true (!dec->stringref))
733 if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 826 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
734 { 827 {
735 I32 len = decode_uint (dec); 828 STRLEN len = decode_uint (dec);
736 char *key = (char *)dec->cur; 829 char *key = (char *)dec->cur;
737 830
831 WANT (len);
738 dec->cur += len; 832 dec->cur += len;
739 833
740 if (ecb_expect_false (dec->stringref))
741 av_push (dec->stringref, newSVpvn (key, len));
742
743 hv_store (hv, key, len, decode_sv (dec), 0); 834 hv_store (hv, key, len, decode_sv (dec), 0);
744 835
745 return; 836 return;
746 } 837 }
747 else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 838 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
748 { 839 {
749 I32 len = decode_uint (dec); 840 STRLEN len = decode_uint (dec);
750 char *key = (char *)dec->cur; 841 char *key = (char *)dec->cur;
751 842
843 WANT (len);
752 dec->cur += len; 844 dec->cur += len;
753 845
754 if (ecb_expect_false (dec->stringref)) 846 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
755 av_push (dec->stringref, newSVpvn_utf8 (key, len, 1)); 847 if (!is_utf8_string (key, len))
848 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
756 849
757 hv_store (hv, key, -len, decode_sv (dec), 0); 850 hv_store (hv, key, -len, decode_sv (dec), 0);
758 851
759 return; 852 return;
760 } 853 }
761 854
762 SV *k = decode_sv (dec); 855 SV *k = decode_sv (dec);
763 SV *v = decode_sv (dec); 856 SV *v = decode_sv (dec);
764 857
858 // we leak memory if uncaught exceptions are thrown by random magical
859 // methods, and this is hopefully the only place where it can happen,
860 // so if there is a chance of an exception, take the very slow path.
861 // since catching exceptions is "undocumented/internal/forbidden" by
862 // the new p5p powers, we need to call out to a perl function :/
863 if (ecb_expect_false (SvAMAGIC (k)))
864 {
865 dSP;
866
867 ENTER; SAVETMPS;
868 PUSHMARK (SP);
869 EXTEND (SP, 3);
870 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
871 PUSHs (sv_2mortal (k));
872 PUSHs (sv_2mortal (v));
873
874 PUTBACK;
875 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
876 SPAGAIN;
877
878 FREETMPS; LEAVE;
879
880 if (SvTRUE (ERRSV))
881 ERR_ERRSV;
882
883 return;
884 }
885
765 hv_store_ent (hv, k, v, 0); 886 hv_store_ent (hv, k, v, 0);
766 SvREFCNT_dec (k); 887 SvREFCNT_dec_NN (k);
888
889fail:
890 ;
767} 891}
768 892
769static SV * 893static SV *
770decode_hv (dec_t *dec) 894decode_hv (dec_t *dec)
771{ 895{
… …
779 903
780 for (;;) 904 for (;;)
781 { 905 {
782 WANT (1); 906 WANT (1);
783 907
784 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 908 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
785 { 909 {
786 ++dec->cur; 910 ++dec->cur;
787 break; 911 break;
788 } 912 }
789 913
790 decode_he (dec, hv); 914 decode_he (dec, hv);
791 } 915 }
792 } 916 }
793 else 917 else
794 { 918 {
795 int pairs = decode_uint (dec); 919 UV pairs = decode_uint (dec);
920
921 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
796 922
797 while (pairs--) 923 while (pairs--)
798 decode_he (dec, hv); 924 decode_he (dec, hv);
799 } 925 }
800 926
801 DEC_DEC_DEPTH; 927 DEC_DEC_DEPTH;
802 return newRV_noinc ((SV *)hv); 928 return newRV_noinc ((SV *)hv);
803 929
804fail: 930fail:
805 SvREFCNT_dec (hv); 931 SvREFCNT_dec_NN (hv);
806 DEC_DEC_DEPTH; 932 DEC_DEC_DEPTH;
807 return &PL_sv_undef; 933 return &PL_sv_undef;
808} 934}
809 935
810static SV * 936static SV *
811decode_str (dec_t *dec, int utf8) 937decode_str (dec_t *dec, int utf8)
812{ 938{
813 SV *sv = 0; 939 SV *sv = 0;
814 940
815 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 941 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
816 { 942 {
817 // indefinite length strings 943 // indefinite length strings
818 ++dec->cur; 944 ++dec->cur;
819 945
820 U8 major = *dec->cur & MAJOR_MISC; 946 U8 major = *dec->cur & MAJOR_MISC;
… …
853 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1)) 979 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
854 av_push (dec->stringref, SvREFCNT_inc_NN (sv)); 980 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
855 } 981 }
856 982
857 if (utf8) 983 if (utf8)
984 {
985 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
986 if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
987 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
988
858 SvUTF8_on (sv); 989 SvUTF8_on (sv);
990 }
859 991
860 return sv; 992 return sv;
861 993
862fail: 994fail:
863 SvREFCNT_dec (sv); 995 SvREFCNT_dec (sv);
… …
882 sv = newRV_noinc (decode_sv (dec)); 1014 sv = newRV_noinc (decode_sv (dec));
883 break; 1015 break;
884 1016
885 case CBOR_TAG_STRINGREF_NAMESPACE: 1017 case CBOR_TAG_STRINGREF_NAMESPACE:
886 { 1018 {
1019 // do not use SAVETMPS/FREETMPS, as these will
1020 // erase mortalised caches, e.g. "shareable"
887 ENTER; SAVETMPS; 1021 ENTER;
888 1022
889 SAVESPTR (dec->stringref); 1023 SAVESPTR (dec->stringref);
890 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1024 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
891 1025
892 sv = decode_sv (dec); 1026 sv = decode_sv (dec);
893 1027
894 FREETMPS; LEAVE; 1028 LEAVE;
895 } 1029 }
896 break; 1030 break;
897 1031
898 case CBOR_TAG_STRINGREF: 1032 case CBOR_TAG_STRINGREF:
899 { 1033 {
900 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1034 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
901 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1035 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
902 1036
903 UV idx = decode_uint (dec); 1037 UV idx = decode_uint (dec);
904 1038
905 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1039 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
906 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1040 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
907 1041
908 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1042 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
909 } 1043 }
910 break; 1044 break;
… …
912 case CBOR_TAG_VALUE_SHAREABLE: 1046 case CBOR_TAG_VALUE_SHAREABLE:
913 { 1047 {
914 if (ecb_expect_false (!dec->shareable)) 1048 if (ecb_expect_false (!dec->shareable))
915 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ()); 1049 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
916 1050
1051 if (dec->cbor.flags & F_ALLOW_CYCLES)
1052 {
917 sv = newSV (0); 1053 sv = newSV (0);
918 av_push (dec->shareable, SvREFCNT_inc_NN (sv)); 1054 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
919 1055
920 SV *osv = decode_sv (dec); 1056 SV *osv = decode_sv (dec);
921 sv_setsv (sv, osv); 1057 sv_setsv (sv, osv);
922 SvREFCNT_dec_NN (osv); 1058 SvREFCNT_dec_NN (osv);
1059 }
1060 else
1061 {
1062 av_push (dec->shareable, &PL_sv_undef);
1063 int idx = AvFILLp (dec->shareable);
1064 sv = decode_sv (dec);
1065 av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
1066 }
923 } 1067 }
924 break; 1068 break;
925 1069
926 case CBOR_TAG_VALUE_SHAREDREF: 1070 case CBOR_TAG_VALUE_SHAREDREF:
927 { 1071 {
928 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1072 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
929 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1073 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
930 1074
931 UV idx = decode_uint (dec); 1075 UV idx = decode_uint (dec);
932 1076
933 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1077 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
934 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1078 ERR ("corrupted CBOR data (sharedref index out of bounds)");
935 1079
936 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1080 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1081
1082 if (sv == &PL_sv_undef)
1083 ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
937 } 1084 }
938 break; 1085 break;
939 1086
940 case CBOR_TAG_PERL_OBJECT: 1087 case CBOR_TAG_PERL_OBJECT:
941 { 1088 {
1089 if (dec->cbor.flags & F_FORBID_OBJECTS)
1090 goto filter;
1091
942 sv = decode_sv (dec); 1092 sv = decode_sv (dec);
943 1093
944 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1094 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
945 ERR ("corrupted CBOR data (non-array perl object)"); 1095 ERR ("corrupted CBOR data (non-array perl object)");
946 1096
… …
956 if (!method) 1106 if (!method)
957 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1107 ERR ("cannot decode perl-object (package does not have a THAW method)");
958 1108
959 dSP; 1109 dSP;
960 1110
961 ENTER; SAVETMPS; PUSHMARK (SP); 1111 ENTER; SAVETMPS;
1112 PUSHMARK (SP);
962 EXTEND (SP, len + 1); 1113 EXTEND (SP, len + 1);
963 // we re-bless the reference to get overload and other niceties right 1114 // we re-bless the reference to get overload and other niceties right
964 PUSHs (*av_fetch (av, 0, 1)); 1115 PUSHs (*av_fetch (av, 0, 1));
965 PUSHs (sv_cbor); 1116 PUSHs (sv_cbor);
966 1117
… …
974 SPAGAIN; 1125 SPAGAIN;
975 1126
976 if (SvTRUE (ERRSV)) 1127 if (SvTRUE (ERRSV))
977 { 1128 {
978 FREETMPS; LEAVE; 1129 FREETMPS; LEAVE;
979 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1130 ERR_ERRSV;
980 } 1131 }
981 1132
982 SvREFCNT_dec (sv); 1133 SvREFCNT_dec_NN (sv);
983 sv = SvREFCNT_inc (POPs); 1134 sv = SvREFCNT_inc (POPs);
984 1135
985 PUTBACK; 1136 PUTBACK;
986 1137
987 FREETMPS; LEAVE; 1138 FREETMPS; LEAVE;
988 } 1139 }
989 break; 1140 break;
990 1141
991 default: 1142 default:
1143 filter:
992 { 1144 {
1145 SV *tag_sv = newSVuv (tag);
1146
993 sv = decode_sv (dec); 1147 sv = decode_sv (dec);
994 1148
995 dSP; 1149 dSP;
996 ENTER; SAVETMPS; PUSHMARK (SP); 1150 ENTER; SAVETMPS;
1151 PUSHMARK (SP);
997 EXTEND (SP, 2); 1152 EXTEND (SP, 2);
998 PUSHs (newSVuv (tag)); 1153 PUSHs (tag_sv);
999 PUSHs (sv); 1154 PUSHs (sv);
1000 1155
1001 PUTBACK; 1156 PUTBACK;
1002 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1157 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1003 SPAGAIN; 1158 SPAGAIN;
1004 1159
1005 if (SvTRUE (ERRSV)) 1160 if (SvTRUE (ERRSV))
1006 { 1161 {
1162 SvREFCNT_dec_NN (tag_sv);
1007 FREETMPS; LEAVE; 1163 FREETMPS; LEAVE;
1008 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1164 ERR_ERRSV;
1009 } 1165 }
1010 1166
1011 if (count) 1167 if (count)
1012 { 1168 {
1169 SvREFCNT_dec_NN (tag_sv);
1013 SvREFCNT_dec (sv); 1170 SvREFCNT_dec_NN (sv);
1014 sv = SvREFCNT_inc (POPs); 1171 sv = SvREFCNT_inc_NN (TOPs);
1172 SP -= count;
1015 } 1173 }
1016 else 1174 else
1017 { 1175 {
1018 AV *av = newAV (); 1176 AV *av = newAV ();
1019 av_push (av, newSVuv (tag)); 1177 av_push (av, tag_sv);
1020 av_push (av, sv); 1178 av_push (av, sv);
1021 1179
1022 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1180 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1023 ? cbor_tagged_stash 1181 ? cbor_tagged_stash
1024 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1182 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1110 1268
1111 return newSVnv (ecb_binary64_to_double (fp)); 1269 return newSVnv (ecb_binary64_to_double (fp));
1112 } 1270 }
1113 1271
1114 // 0..19 unassigned simple 1272 // 0..19 unassigned simple
1115 // 24 reserved + unassigned (reserved values are not encodable) 1273 // 24 reserved + unassigned simple (reserved values are not encodable)
1274 // 28-30 unassigned misc
1275 // 31 break code
1116 default: 1276 default:
1117 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1277 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1118 } 1278 }
1119 1279
1120 break; 1280 break;
1121 } 1281 }
1122 1282
… …
1125} 1285}
1126 1286
1127static SV * 1287static SV *
1128decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1288decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1129{ 1289{
1130 dec_t dec = { }; 1290 dec_t dec = { 0 };
1131 SV *sv; 1291 SV *sv;
1132 STRLEN len; 1292 STRLEN len;
1133 char *data = SvPVbyte (string, len); 1293 char *data = SvPVbyte (string, len);
1134 1294
1135 if (len > cbor->max_size && cbor->max_size) 1295 if (len > cbor->max_size && cbor->max_size)
… …
1149 if (dec.cur != dec.end && !dec.err) 1309 if (dec.cur != dec.end && !dec.err)
1150 dec.err = "garbage after CBOR object"; 1310 dec.err = "garbage after CBOR object";
1151 1311
1152 if (dec.err) 1312 if (dec.err)
1153 { 1313 {
1314 if (dec.shareable)
1315 {
1316 // need to break cyclic links, which would all be in shareable
1317 int i;
1318 SV **svp;
1319
1320 for (i = av_len (dec.shareable) + 1; i--; )
1321 if ((svp = av_fetch (dec.shareable, i, 0)))
1322 sv_setsv (*svp, &PL_sv_undef);
1323 }
1324
1154 SvREFCNT_dec (sv); 1325 SvREFCNT_dec_NN (sv);
1326
1327 if (dec.err_sv)
1328 sv_2mortal (dec.err_sv);
1329
1155 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1330 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1156 } 1331 }
1157 1332
1158 sv = sv_2mortal (sv); 1333 sv = sv_2mortal (sv);
1159 1334
1160 return sv; 1335 return sv;
1161} 1336}
1162 1337
1338/////////////////////////////////////////////////////////////////////////////
1339// incremental parser
1340
1341#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
1342
1343// returns 0 for notyet, 1 for success or error
1344static int
1345incr_parse (CBOR *self, SV *cborstr)
1346{
1347 STRLEN cur;
1348 SvPV (cborstr, cur);
1349
1350 while (ecb_expect_true (self->incr_need <= cur))
1351 {
1352 // table of integer count bytes
1353 static I8 incr_len[MINOR_MASK + 1] = {
1354 0, 0, 0, 0, 0, 0, 0, 0,
1355 0, 0, 0, 0, 0, 0, 0, 0,
1356 0, 0, 0, 0, 0, 0, 0, 0,
1357 1, 2, 4, 8,-1,-1,-1,-2
1358 };
1359
1360 const U8 *p = SvPVX (cborstr) + self->incr_pos;
1361 U8 m = *p & MINOR_MASK;
1362 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1363 I8 ilen = incr_len[m];
1364
1365 self->incr_need = self->incr_pos + 1;
1366
1367 if (ecb_expect_false (ilen < 0))
1368 {
1369 if (m != MINOR_INDEF)
1370 return 1; // error
1371
1372 if (*p == (MAJOR_MISC | MINOR_INDEF))
1373 {
1374 if (count >= 0)
1375 return 1; // error
1376
1377 count = 1;
1378 }
1379 else
1380 {
1381 av_push (self->incr_count, newSViv (-1)); //TODO: nest
1382 count = -1;
1383 }
1384 }
1385 else
1386 {
1387 self->incr_need += ilen;
1388 if (ecb_expect_false (self->incr_need > cur))
1389 return 0;
1390
1391 int major = *p >> MAJOR_SHIFT;
1392
1393 switch (major)
1394 {
1395 case MAJOR_TAG >> MAJOR_SHIFT:
1396 ++count; // tags merely prefix another value
1397 break;
1398
1399 case MAJOR_BYTES >> MAJOR_SHIFT:
1400 case MAJOR_TEXT >> MAJOR_SHIFT:
1401 case MAJOR_ARRAY >> MAJOR_SHIFT:
1402 case MAJOR_MAP >> MAJOR_SHIFT:
1403 {
1404 UV len;
1405
1406 if (ecb_expect_false (ilen))
1407 {
1408 len = 0;
1409
1410 do {
1411 len = (len << 8) | *++p;
1412 } while (--ilen);
1413 }
1414 else
1415 len = m;
1416
1417 switch (major)
1418 {
1419 case MAJOR_BYTES >> MAJOR_SHIFT:
1420 case MAJOR_TEXT >> MAJOR_SHIFT:
1421 self->incr_need += len;
1422 if (ecb_expect_false (self->incr_need > cur))
1423 return 0;
1424
1425 break;
1426
1427 case MAJOR_MAP >> MAJOR_SHIFT:
1428 len <<= 1;
1429 case MAJOR_ARRAY >> MAJOR_SHIFT:
1430 if (len)
1431 {
1432 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1433 count = len + 1;
1434 }
1435 break;
1436 }
1437 }
1438 }
1439 }
1440
1441 self->incr_pos = self->incr_need;
1442
1443 if (count > 0)
1444 {
1445 while (!--count)
1446 {
1447 if (!AvFILLp (self->incr_count))
1448 return 1; // done
1449
1450 SvREFCNT_dec_NN (av_pop (self->incr_count));
1451 count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1452 }
1453
1454 SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
1455 }
1456 }
1457
1458 return 0;
1459}
1460
1461
1163///////////////////////////////////////////////////////////////////////////// 1462/////////////////////////////////////////////////////////////////////////////
1164// XS interface functions 1463// XS interface functions
1165 1464
1166MODULE = CBOR::XS PACKAGE = CBOR::XS 1465MODULE = CBOR::XS PACKAGE = CBOR::XS
1167 1466
… …
1179 1478
1180 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1479 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1181 1480
1182 sv_cbor = newSVpv ("CBOR", 0); 1481 sv_cbor = newSVpv ("CBOR", 0);
1183 SvREADONLY_on (sv_cbor); 1482 SvREADONLY_on (sv_cbor);
1483
1484 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1184} 1485}
1185 1486
1186PROTOTYPES: DISABLE 1487PROTOTYPES: DISABLE
1187 1488
1188void CLONE (...) 1489void CLONE (...)
… …
1207void shrink (CBOR *self, int enable = 1) 1508void shrink (CBOR *self, int enable = 1)
1208 ALIAS: 1509 ALIAS:
1209 shrink = F_SHRINK 1510 shrink = F_SHRINK
1210 allow_unknown = F_ALLOW_UNKNOWN 1511 allow_unknown = F_ALLOW_UNKNOWN
1211 allow_sharing = F_ALLOW_SHARING 1512 allow_sharing = F_ALLOW_SHARING
1513 allow_cycles = F_ALLOW_CYCLES
1514 forbid_objects = F_FORBID_OBJECTS
1212 pack_strings = F_PACK_STRINGS 1515 pack_strings = F_PACK_STRINGS
1516 text_keys = F_TEXT_KEYS
1517 text_strings = F_TEXT_STRINGS
1518 validate_utf8 = F_VALIDATE_UTF8
1213 PPCODE: 1519 PPCODE:
1214{ 1520{
1215 if (enable) 1521 if (enable)
1216 self->flags |= ix; 1522 self->flags |= ix;
1217 else 1523 else
… …
1223void get_shrink (CBOR *self) 1529void get_shrink (CBOR *self)
1224 ALIAS: 1530 ALIAS:
1225 get_shrink = F_SHRINK 1531 get_shrink = F_SHRINK
1226 get_allow_unknown = F_ALLOW_UNKNOWN 1532 get_allow_unknown = F_ALLOW_UNKNOWN
1227 get_allow_sharing = F_ALLOW_SHARING 1533 get_allow_sharing = F_ALLOW_SHARING
1534 get_allow_cycles = F_ALLOW_CYCLES
1535 get_forbid_objects = F_FORBID_OBJECTS
1228 get_pack_strings = F_PACK_STRINGS 1536 get_pack_strings = F_PACK_STRINGS
1537 get_text_keys = F_TEXT_KEYS
1538 get_text_strings = F_TEXT_STRINGS
1539 get_validate_utf8 = F_VALIDATE_UTF8
1229 PPCODE: 1540 PPCODE:
1230 XPUSHs (boolSV (self->flags & ix)); 1541 XPUSHs (boolSV (self->flags & ix));
1231 1542
1232void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1543void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1233 PPCODE: 1544 PPCODE:
… …
1282 EXTEND (SP, 2); 1593 EXTEND (SP, 2);
1283 PUSHs (sv); 1594 PUSHs (sv);
1284 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1595 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1285} 1596}
1286 1597
1598void incr_parse (CBOR *self, SV *cborstr)
1599 ALIAS:
1600 incr_parse_multiple = 1
1601 PPCODE:
1602{
1603 if (SvUTF8 (cborstr))
1604 sv_utf8_downgrade (cborstr, 0);
1605
1606 if (!self->incr_count)
1607 {
1608 self->incr_count = newAV ();
1609 self->incr_pos = 0;
1610 self->incr_need = 1;
1611
1612 av_push (self->incr_count, newSViv (1));
1613 }
1614
1615 do
1616 {
1617 if (!incr_parse (self, cborstr))
1618 {
1619 if (self->incr_need > self->max_size && self->max_size)
1620 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1621 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1622
1623 break;
1624 }
1625
1626 SV *sv;
1627 char *offset;
1628
1629 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1630 XPUSHs (sv);
1631
1632 sv_chop (cborstr, offset);
1633
1634 av_clear (self->incr_count);
1635 av_push (self->incr_count, newSViv (1));
1636
1637 self->incr_pos = 0;
1638 self->incr_need = self->incr_pos + 1;
1639 }
1640 while (ix);
1641}
1642
1643void incr_reset (CBOR *self)
1644 CODE:
1645{
1646 SvREFCNT_dec (self->incr_count);
1647 self->incr_count = 0;
1648}
1649
1287void DESTROY (CBOR *self) 1650void DESTROY (CBOR *self)
1288 PPCODE: 1651 PPCODE:
1289 cbor_free (self); 1652 cbor_free (self);
1290 1653
1291PROTOTYPES: ENABLE 1654PROTOTYPES: ENABLE
… …
1310 cbor_init (&cbor); 1673 cbor_init (&cbor);
1311 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1674 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1312 XPUSHs (cborstr); 1675 XPUSHs (cborstr);
1313} 1676}
1314 1677
1678#ifdef __AFL_COMPILER
1679
1680void
1681afl_init ()
1682 CODE:
1683 __AFL_INIT ();
1684
1685int
1686afl_loop (unsigned int count = 10000)
1687 CODE:
1688 RETVAL = __AFL_LOOP (count);
1689 OUTPUT:
1690 RETVAL
1691
1692#endif
1693

Diff Legend

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