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.39 by root, Sun Dec 1 14:45:03 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
… …
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
102#define F_ALLOW_CYCLES 0x00000008UL 107#define F_ALLOW_CYCLES 0x00000008UL
108#define F_FORBID_OBJECTS 0x00000010UL
103#define F_PACK_STRINGS 0x00000010UL 109#define F_PACK_STRINGS 0x00000020UL
110#define F_TEXT_KEYS 0x00000040UL
111#define F_TEXT_STRINGS 0x00000080UL
104#define F_VALIDATE_UTF8 0x00000020UL 112#define F_VALIDATE_UTF8 0x00000100UL
105 113
106#define INIT_SIZE 32 // initial scalar size to be allocated 114#define INIT_SIZE 32 // initial scalar size to be allocated
107 115
108#define SB do { 116#define SB do {
109#define SE } while (0) 117#define SE } while (0)
… …
128typedef struct { 136typedef struct {
129 U32 flags; 137 U32 flags;
130 U32 max_depth; 138 U32 max_depth;
131 STRLEN max_size; 139 STRLEN max_size;
132 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.
133} CBOR; 146} CBOR;
134 147
135ecb_inline void 148ecb_inline void
136cbor_init (CBOR *cbor) 149cbor_init (CBOR *cbor)
137{ 150{
… …
141 154
142ecb_inline void 155ecb_inline void
143cbor_free (CBOR *cbor) 156cbor_free (CBOR *cbor)
144{ 157{
145 SvREFCNT_dec (cbor->filter); 158 SvREFCNT_dec (cbor->filter);
159 SvREFCNT_dec (cbor->incr_count);
146} 160}
147 161
148///////////////////////////////////////////////////////////////////////////// 162/////////////////////////////////////////////////////////////////////////////
149// utility functions 163// utility functions
150 164
… …
176 190
177// minimum length of a string to be registered for stringref 191// minimum length of a string to be registered for stringref
178ecb_inline int 192ecb_inline int
179minimum_string_length (UV idx) 193minimum_string_length (UV idx)
180{ 194{
181 return idx > 23 195 return idx <= 23 ? 3
182 ? idx > 0xffU 196 : idx <= 0xffU ? 4
183 ? idx > 0xffffU 197 : idx <= 0xffffU ? 5
184 ? idx > 0xffffffffU 198 : idx <= 0xffffffffU ? 7
185 ? 11 199 : 11;
186 : 7
187 : 5
188 : 4
189 : 3;
190} 200}
191 201
192///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
193// encoder 203// encoder
194 204
… …
207} enc_t; 217} enc_t;
208 218
209ecb_inline void 219ecb_inline void
210need (enc_t *enc, STRLEN len) 220need (enc_t *enc, STRLEN len)
211{ 221{
212 if (ecb_expect_false (enc->cur + len >= enc->end)) 222 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
213 { 223 {
214 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 224 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
215 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 225 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
216 enc->cur = SvPVX (enc->sv) + cur; 226 enc->cur = SvPVX (enc->sv) + cur;
217 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
269encode_tag (enc_t *enc, UV tag) 279encode_tag (enc_t *enc, UV tag)
270{ 280{
271 encode_uint (enc, MAJOR_TAG, tag); 281 encode_uint (enc, MAJOR_TAG, tag);
272} 282}
273 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
274ecb_inline void 307ecb_inline void
275encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 308encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
276{ 309{
310 if (ecb_expect_false (upgrade_utf8))
311 if (!utf8)
312 {
313 encode_str_utf8 (enc, utf8, str, len);
314 return;
315 }
316
277 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 317 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
278 need (enc, len); 318 need (enc, len);
279 memcpy (enc->cur, str, len); 319 memcpy (enc->cur, str, len);
280 enc->cur += len; 320 enc->cur += len;
281} 321}
282 322
283static void 323ecb_inline void
284encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 324encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
285{ 325{
286 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 326 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
287 { 327 {
288 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 328 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
289 329
… …
300 sv_setuv (*svp, enc->stringref_idx); 340 sv_setuv (*svp, enc->stringref_idx);
301 ++enc->stringref_idx; 341 ++enc->stringref_idx;
302 } 342 }
303 } 343 }
304 344
305 encode_str (enc, utf8, str, len); 345 encode_str (enc, upgrade_utf8, utf8, str, len);
306} 346}
307 347
308static void encode_sv (enc_t *enc, SV *sv); 348static void encode_sv (enc_t *enc, SV *sv);
309 349
310static void 350static void
… …
317 357
318 ++enc->depth; 358 ++enc->depth;
319 359
320 encode_uint (enc, MAJOR_ARRAY, len + 1); 360 encode_uint (enc, MAJOR_ARRAY, len + 1);
321 361
362 if (ecb_expect_false (SvMAGICAL (av)))
322 for (i = 0; i <= len; ++i) 363 for (i = 0; i <= len; ++i)
323 { 364 {
324 SV **svp = av_fetch (av, i, 0); 365 SV **svp = av_fetch (av, i, 0);
325 encode_sv (enc, svp ? *svp : &PL_sv_undef); 366 encode_sv (enc, svp ? *svp : &PL_sv_undef);
326 } 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 }
327 374
328 --enc->depth; 375 --enc->depth;
329} 376}
330 377
331static void 378static void
… …
339 ++enc->depth; 386 ++enc->depth;
340 387
341 int pairs = hv_iterinit (hv); 388 int pairs = hv_iterinit (hv);
342 int mg = SvMAGICAL (hv); 389 int mg = SvMAGICAL (hv);
343 390
344 if (mg) 391 if (ecb_expect_false (mg))
345 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
346 else 393 else
347 encode_uint (enc, MAJOR_MAP, pairs); 394 encode_uint (enc, MAJOR_MAP, pairs);
348 395
349 while ((he = hv_iternext (hv))) 396 while ((he = hv_iternext (hv)))
350 { 397 {
351 if (HeKLEN (he) == HEf_SVKEY) 398 if (HeKLEN (he) == HEf_SVKEY)
352 encode_sv (enc, HeSVKEY (he)); 399 encode_sv (enc, HeSVKEY (he));
353 else 400 else
354 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));
355 402
356 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));
357 } 404 }
358 405
359 if (mg) 406 if (ecb_expect_false (mg))
360 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
361 408
362 --enc->depth; 409 --enc->depth;
363} 410}
364 411
… …
407 } 454 }
408 455
409 if (ecb_expect_false (SvREFCNT (sv) > 1) 456 if (ecb_expect_false (SvREFCNT (sv) > 1)
410 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 457 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
411 { 458 {
412 if (!enc->shareable) 459 if (ecb_expect_false (!enc->shareable))
413 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 460 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
414 461
415 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 462 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
416 463
417 if (SvOK (*svp)) 464 if (SvOK (*svp))
… …
431 if (ecb_expect_false (SvOBJECT (sv))) 478 if (ecb_expect_false (SvOBJECT (sv)))
432 { 479 {
433 HV *stash = SvSTASH (sv); 480 HV *stash = SvSTASH (sv);
434 GV *method; 481 GV *method;
435 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))));
436 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 486 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
437 { 487 {
438 dSP; 488 dSP;
439 489
440 ENTER; SAVETMPS; PUSHMARK (SP); 490 ENTER; SAVETMPS;
491 PUSHMARK (SP);
441 // 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
442 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 493 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
443 494
444 PUTBACK; 495 PUTBACK;
445 // G_SCALAR ensures that return value is 1 496 // G_SCALAR ensures that return value is 1
… …
458 } 509 }
459 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
460 { 511 {
461 dSP; 512 dSP;
462 513
463 ENTER; SAVETMPS; PUSHMARK (SP); 514 ENTER; SAVETMPS;
515 PUSHMARK (SP);
464 EXTEND (SP, 2); 516 EXTEND (SP, 2);
465 // 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
466 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 518 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
467 PUSHs (sv_cbor); 519 PUSHs (sv_cbor);
468 520
… …
474 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 526 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
475 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));
476 528
477 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 529 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
478 encode_uint (enc, MAJOR_ARRAY, count + 1); 530 encode_uint (enc, MAJOR_ARRAY, count + 1);
479 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 531 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
480 532
481 while (count) 533 {
534 int i;
535
536 for (i = 0; i < count; ++i)
482 encode_sv (enc, SP[1 - count--]); 537 encode_sv (enc, SP[i + 1 - count]);
538
539 SP -= count;
540 }
483 541
484 PUTBACK; 542 PUTBACK;
485 543
486 FREETMPS; LEAVE; 544 FREETMPS; LEAVE;
487 } 545 }
… …
510 if (ecb_expect_false (nv == (NV)(U32)nv)) 568 if (ecb_expect_false (nv == (NV)(U32)nv))
511 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 569 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
512 //TODO: maybe I32? 570 //TODO: maybe I32?
513 else if (ecb_expect_false (nv == (float)nv)) 571 else if (ecb_expect_false (nv == (float)nv))
514 { 572 {
573 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
574
515 uint32_t fp = ecb_float_to_binary32 (nv); 575 uint32_t fp = ecb_float_to_binary32 (nv);
516
517 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
518 576
519 if (!ecb_big_endian ()) 577 if (!ecb_big_endian ())
520 fp = ecb_bswap32 (fp); 578 fp = ecb_bswap32 (fp);
521 579
522 memcpy (enc->cur, &fp, 4); 580 memcpy (enc->cur, &fp, 4);
523 enc->cur += 4; 581 enc->cur += 4;
524 } 582 }
525 else 583 else
526 { 584 {
585 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
586
527 uint64_t fp = ecb_double_to_binary64 (nv); 587 uint64_t fp = ecb_double_to_binary64 (nv);
528
529 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
530 588
531 if (!ecb_big_endian ()) 589 if (!ecb_big_endian ())
532 fp = ecb_bswap64 (fp); 590 fp = ecb_bswap64 (fp);
533 591
534 memcpy (enc->cur, &fp, 8); 592 memcpy (enc->cur, &fp, 8);
… …
543 601
544 if (SvPOKp (sv)) 602 if (SvPOKp (sv))
545 { 603 {
546 STRLEN len; 604 STRLEN len;
547 char *str = SvPV (sv, len); 605 char *str = SvPV (sv, len);
548 encode_strref (enc, SvUTF8 (sv), str, len); 606 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
549 } 607 }
550 else if (SvNOKp (sv)) 608 else if (SvNOKp (sv))
551 encode_nv (enc, sv); 609 encode_nv (enc, sv);
552 else if (SvIOKp (sv)) 610 else if (SvIOKp (sv))
553 { 611 {
… …
570} 628}
571 629
572static SV * 630static SV *
573encode_cbor (SV *scalar, CBOR *cbor) 631encode_cbor (SV *scalar, CBOR *cbor)
574{ 632{
575 enc_t enc = { }; 633 enc_t enc = { 0 };
576 634
577 enc.cbor = *cbor; 635 enc.cbor = *cbor;
578 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 636 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
579 enc.cur = SvPVX (enc.sv); 637 enc.cur = SvPVX (enc.sv);
580 enc.end = SvEND (enc.sv); 638 enc.end = SvEND (enc.sv);
581 639
582 SvPOK_only (enc.sv); 640 SvPOK_only (enc.sv);
583 641
584 if (cbor->flags & F_PACK_STRINGS) 642 if (cbor->flags & F_PACK_STRINGS)
585 { 643 {
… …
612 U32 depth; // recursion depth 670 U32 depth; // recursion depth
613 U32 maxdepth; // recursion depth limit 671 U32 maxdepth; // recursion depth limit
614 AV *shareable; 672 AV *shareable;
615 AV *stringref; 673 AV *stringref;
616 SV *decode_tagged; 674 SV *decode_tagged;
675 SV *err_sv; // optional sv for error, needs to be freed
617} dec_t; 676} dec_t;
618 677
619#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);
620 685
621#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;
622 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
623#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)
624#define DEC_DEC_DEPTH --dec->depth 715#define DEC_DEC_DEPTH --dec->depth
625 716
626static UV 717static UV
627decode_uint (dec_t *dec) 718decode_uint (dec_t *dec)
628{ 719{
… …
694 785
695 for (;;) 786 for (;;)
696 { 787 {
697 WANT (1); 788 WANT (1);
698 789
699 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 790 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
700 { 791 {
701 ++dec->cur; 792 ++dec->cur;
702 break; 793 break;
703 } 794 }
704 795
705 av_push (av, decode_sv (dec)); 796 av_push (av, decode_sv (dec));
706 } 797 }
707 } 798 }
708 else 799 else
709 { 800 {
710 int i, len = decode_uint (dec); 801 UV i, len = decode_uint (dec);
711 802
712 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
713 av_fill (av, len - 1); 804 av_fill (av, len - 1);
714 805
715 for (i = 0; i < len; ++i) 806 for (i = 0; i < len; ++i)
… …
718 809
719 DEC_DEC_DEPTH; 810 DEC_DEC_DEPTH;
720 return newRV_noinc ((SV *)av); 811 return newRV_noinc ((SV *)av);
721 812
722fail: 813fail:
723 SvREFCNT_dec (av); 814 SvREFCNT_dec_NN (av);
724 DEC_DEC_DEPTH; 815 DEC_DEC_DEPTH;
725 return &PL_sv_undef; 816 return &PL_sv_undef;
726} 817}
727 818
728static void 819static void
… …
730{ 821{
731 // for speed reasons, we specialcase single-string 822 // for speed reasons, we specialcase single-string
732 // byte or utf-8 strings as keys, but only when !stringref 823 // byte or utf-8 strings as keys, but only when !stringref
733 824
734 if (ecb_expect_true (!dec->stringref)) 825 if (ecb_expect_true (!dec->stringref))
735 if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 826 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
736 { 827 {
737 I32 len = decode_uint (dec); 828 STRLEN len = decode_uint (dec);
738 char *key = (char *)dec->cur; 829 char *key = (char *)dec->cur;
739 830
831 WANT (len);
740 dec->cur += len; 832 dec->cur += len;
741 833
742 hv_store (hv, key, len, decode_sv (dec), 0); 834 hv_store (hv, key, len, decode_sv (dec), 0);
743 835
744 return; 836 return;
745 } 837 }
746 else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 838 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
747 { 839 {
748 I32 len = decode_uint (dec); 840 STRLEN len = decode_uint (dec);
749 char *key = (char *)dec->cur; 841 char *key = (char *)dec->cur;
750 842
843 WANT (len);
751 dec->cur += len; 844 dec->cur += len;
752 845
753 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 846 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
754 if (!is_utf8_string (key, len)) 847 if (!is_utf8_string (key, len))
755 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 848 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
… …
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);
767 888
768fail: 889fail:
769 ; 890 ;
770} 891}
771 892
… …
782 903
783 for (;;) 904 for (;;)
784 { 905 {
785 WANT (1); 906 WANT (1);
786 907
787 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 908 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
788 { 909 {
789 ++dec->cur; 910 ++dec->cur;
790 break; 911 break;
791 } 912 }
792 913
793 decode_he (dec, hv); 914 decode_he (dec, hv);
794 } 915 }
795 } 916 }
796 else 917 else
797 { 918 {
798 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
799 922
800 while (pairs--) 923 while (pairs--)
801 decode_he (dec, hv); 924 decode_he (dec, hv);
802 } 925 }
803 926
804 DEC_DEC_DEPTH; 927 DEC_DEC_DEPTH;
805 return newRV_noinc ((SV *)hv); 928 return newRV_noinc ((SV *)hv);
806 929
807fail: 930fail:
808 SvREFCNT_dec (hv); 931 SvREFCNT_dec_NN (hv);
809 DEC_DEC_DEPTH; 932 DEC_DEC_DEPTH;
810 return &PL_sv_undef; 933 return &PL_sv_undef;
811} 934}
812 935
813static SV * 936static SV *
814decode_str (dec_t *dec, int utf8) 937decode_str (dec_t *dec, int utf8)
815{ 938{
816 SV *sv = 0; 939 SV *sv = 0;
817 940
818 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 941 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
819 { 942 {
820 // indefinite length strings 943 // indefinite length strings
821 ++dec->cur; 944 ++dec->cur;
822 945
823 U8 major = *dec->cur & MAJOR_MISC; 946 U8 major = *dec->cur & MAJOR_MISC;
… …
891 sv = newRV_noinc (decode_sv (dec)); 1014 sv = newRV_noinc (decode_sv (dec));
892 break; 1015 break;
893 1016
894 case CBOR_TAG_STRINGREF_NAMESPACE: 1017 case CBOR_TAG_STRINGREF_NAMESPACE:
895 { 1018 {
1019 // do not use SAVETMPS/FREETMPS, as these will
1020 // erase mortalised caches, e.g. "shareable"
896 ENTER; SAVETMPS; 1021 ENTER;
897 1022
898 SAVESPTR (dec->stringref); 1023 SAVESPTR (dec->stringref);
899 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1024 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
900 1025
901 sv = decode_sv (dec); 1026 sv = decode_sv (dec);
902 1027
903 FREETMPS; LEAVE; 1028 LEAVE;
904 } 1029 }
905 break; 1030 break;
906 1031
907 case CBOR_TAG_STRINGREF: 1032 case CBOR_TAG_STRINGREF:
908 { 1033 {
909 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1034 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
910 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1035 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
911 1036
912 UV idx = decode_uint (dec); 1037 UV idx = decode_uint (dec);
913 1038
914 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1039 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
915 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)");
916 1041
917 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1042 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
918 } 1043 }
919 break; 1044 break;
… …
947 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1072 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
948 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1073 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
949 1074
950 UV idx = decode_uint (dec); 1075 UV idx = decode_uint (dec);
951 1076
952 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1077 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
953 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1078 ERR ("corrupted CBOR data (sharedref index out of bounds)");
954 1079
955 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1080 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
956 1081
957 if (sv == &PL_sv_undef) 1082 if (sv == &PL_sv_undef)
… …
959 } 1084 }
960 break; 1085 break;
961 1086
962 case CBOR_TAG_PERL_OBJECT: 1087 case CBOR_TAG_PERL_OBJECT:
963 { 1088 {
1089 if (dec->cbor.flags & F_FORBID_OBJECTS)
1090 goto filter;
1091
964 sv = decode_sv (dec); 1092 sv = decode_sv (dec);
965 1093
966 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1094 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
967 ERR ("corrupted CBOR data (non-array perl object)"); 1095 ERR ("corrupted CBOR data (non-array perl object)");
968 1096
… …
978 if (!method) 1106 if (!method)
979 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)");
980 1108
981 dSP; 1109 dSP;
982 1110
983 ENTER; SAVETMPS; PUSHMARK (SP); 1111 ENTER; SAVETMPS;
1112 PUSHMARK (SP);
984 EXTEND (SP, len + 1); 1113 EXTEND (SP, len + 1);
985 // 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
986 PUSHs (*av_fetch (av, 0, 1)); 1115 PUSHs (*av_fetch (av, 0, 1));
987 PUSHs (sv_cbor); 1116 PUSHs (sv_cbor);
988 1117
… …
996 SPAGAIN; 1125 SPAGAIN;
997 1126
998 if (SvTRUE (ERRSV)) 1127 if (SvTRUE (ERRSV))
999 { 1128 {
1000 FREETMPS; LEAVE; 1129 FREETMPS; LEAVE;
1001 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1130 ERR_ERRSV;
1002 } 1131 }
1003 1132
1004 SvREFCNT_dec (sv); 1133 SvREFCNT_dec_NN (sv);
1005 sv = SvREFCNT_inc (POPs); 1134 sv = SvREFCNT_inc (POPs);
1006 1135
1007 PUTBACK; 1136 PUTBACK;
1008 1137
1009 FREETMPS; LEAVE; 1138 FREETMPS; LEAVE;
1010 } 1139 }
1011 break; 1140 break;
1012 1141
1013 default: 1142 default:
1143 filter:
1014 { 1144 {
1145 SV *tag_sv = newSVuv (tag);
1146
1015 sv = decode_sv (dec); 1147 sv = decode_sv (dec);
1016 1148
1017 dSP; 1149 dSP;
1018 ENTER; SAVETMPS; PUSHMARK (SP); 1150 ENTER; SAVETMPS;
1151 PUSHMARK (SP);
1019 EXTEND (SP, 2); 1152 EXTEND (SP, 2);
1020 PUSHs (newSVuv (tag)); 1153 PUSHs (tag_sv);
1021 PUSHs (sv); 1154 PUSHs (sv);
1022 1155
1023 PUTBACK; 1156 PUTBACK;
1024 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);
1025 SPAGAIN; 1158 SPAGAIN;
1026 1159
1027 if (SvTRUE (ERRSV)) 1160 if (SvTRUE (ERRSV))
1028 { 1161 {
1162 SvREFCNT_dec_NN (tag_sv);
1029 FREETMPS; LEAVE; 1163 FREETMPS; LEAVE;
1030 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1164 ERR_ERRSV;
1031 } 1165 }
1032 1166
1033 if (count) 1167 if (count)
1034 { 1168 {
1169 SvREFCNT_dec_NN (tag_sv);
1035 SvREFCNT_dec (sv); 1170 SvREFCNT_dec_NN (sv);
1036 sv = SvREFCNT_inc (POPs); 1171 sv = SvREFCNT_inc_NN (TOPs);
1172 SP -= count;
1037 } 1173 }
1038 else 1174 else
1039 { 1175 {
1040 AV *av = newAV (); 1176 AV *av = newAV ();
1041 av_push (av, newSVuv (tag)); 1177 av_push (av, tag_sv);
1042 av_push (av, sv); 1178 av_push (av, sv);
1043 1179
1044 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1180 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1045 ? cbor_tagged_stash 1181 ? cbor_tagged_stash
1046 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1182 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1132 1268
1133 return newSVnv (ecb_binary64_to_double (fp)); 1269 return newSVnv (ecb_binary64_to_double (fp));
1134 } 1270 }
1135 1271
1136 // 0..19 unassigned simple 1272 // 0..19 unassigned simple
1137 // 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
1138 default: 1276 default:
1139 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1277 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1140 } 1278 }
1141 1279
1142 break; 1280 break;
1143 } 1281 }
1144 1282
… …
1147} 1285}
1148 1286
1149static SV * 1287static SV *
1150decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1288decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1151{ 1289{
1152 dec_t dec = { }; 1290 dec_t dec = { 0 };
1153 SV *sv; 1291 SV *sv;
1154 STRLEN len; 1292 STRLEN len;
1155 char *data = SvPVbyte (string, len); 1293 char *data = SvPVbyte (string, len);
1156 1294
1157 if (len > cbor->max_size && cbor->max_size) 1295 if (len > cbor->max_size && cbor->max_size)
… …
1173 1311
1174 if (dec.err) 1312 if (dec.err)
1175 { 1313 {
1176 if (dec.shareable) 1314 if (dec.shareable)
1177 { 1315 {
1178 // need to break cyclic links, which whould all be in shareable 1316 // need to break cyclic links, which would all be in shareable
1179 int i; 1317 int i;
1180 SV **svp; 1318 SV **svp;
1181 1319
1182 for (i = av_len (dec.shareable) + 1; i--; ) 1320 for (i = av_len (dec.shareable) + 1; i--; )
1183 if ((svp = av_fetch (dec.shareable, i, 0))) 1321 if ((svp = av_fetch (dec.shareable, i, 0)))
1184 sv_setsv (*svp, &PL_sv_undef); 1322 sv_setsv (*svp, &PL_sv_undef);
1185 } 1323 }
1186 1324
1187 SvREFCNT_dec (sv); 1325 SvREFCNT_dec_NN (sv);
1326
1327 if (dec.err_sv)
1328 sv_2mortal (dec.err_sv);
1329
1188 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);
1189 } 1331 }
1190 1332
1191 sv = sv_2mortal (sv); 1333 sv = sv_2mortal (sv);
1192 1334
1193 return sv; 1335 return sv;
1194} 1336}
1195 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
1196///////////////////////////////////////////////////////////////////////////// 1462/////////////////////////////////////////////////////////////////////////////
1197// XS interface functions 1463// XS interface functions
1198 1464
1199MODULE = CBOR::XS PACKAGE = CBOR::XS 1465MODULE = CBOR::XS PACKAGE = CBOR::XS
1200 1466
… …
1212 1478
1213 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1479 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1214 1480
1215 sv_cbor = newSVpv ("CBOR", 0); 1481 sv_cbor = newSVpv ("CBOR", 0);
1216 SvREADONLY_on (sv_cbor); 1482 SvREADONLY_on (sv_cbor);
1483
1484 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1217} 1485}
1218 1486
1219PROTOTYPES: DISABLE 1487PROTOTYPES: DISABLE
1220 1488
1221void CLONE (...) 1489void CLONE (...)
… …
1241 ALIAS: 1509 ALIAS:
1242 shrink = F_SHRINK 1510 shrink = F_SHRINK
1243 allow_unknown = F_ALLOW_UNKNOWN 1511 allow_unknown = F_ALLOW_UNKNOWN
1244 allow_sharing = F_ALLOW_SHARING 1512 allow_sharing = F_ALLOW_SHARING
1245 allow_cycles = F_ALLOW_CYCLES 1513 allow_cycles = F_ALLOW_CYCLES
1514 forbid_objects = F_FORBID_OBJECTS
1246 pack_strings = F_PACK_STRINGS 1515 pack_strings = F_PACK_STRINGS
1516 text_keys = F_TEXT_KEYS
1517 text_strings = F_TEXT_STRINGS
1247 validate_utf8 = F_VALIDATE_UTF8 1518 validate_utf8 = F_VALIDATE_UTF8
1248 PPCODE: 1519 PPCODE:
1249{ 1520{
1250 if (enable) 1521 if (enable)
1251 self->flags |= ix; 1522 self->flags |= ix;
… …
1259 ALIAS: 1530 ALIAS:
1260 get_shrink = F_SHRINK 1531 get_shrink = F_SHRINK
1261 get_allow_unknown = F_ALLOW_UNKNOWN 1532 get_allow_unknown = F_ALLOW_UNKNOWN
1262 get_allow_sharing = F_ALLOW_SHARING 1533 get_allow_sharing = F_ALLOW_SHARING
1263 get_allow_cycles = F_ALLOW_CYCLES 1534 get_allow_cycles = F_ALLOW_CYCLES
1535 get_forbid_objects = F_FORBID_OBJECTS
1264 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
1265 get_validate_utf8 = F_VALIDATE_UTF8 1539 get_validate_utf8 = F_VALIDATE_UTF8
1266 PPCODE: 1540 PPCODE:
1267 XPUSHs (boolSV (self->flags & ix)); 1541 XPUSHs (boolSV (self->flags & ix));
1268 1542
1269void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1543void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
… …
1319 EXTEND (SP, 2); 1593 EXTEND (SP, 2);
1320 PUSHs (sv); 1594 PUSHs (sv);
1321 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1595 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1322} 1596}
1323 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
1324void DESTROY (CBOR *self) 1650void DESTROY (CBOR *self)
1325 PPCODE: 1651 PPCODE:
1326 cbor_free (self); 1652 cbor_free (self);
1327 1653
1328PROTOTYPES: ENABLE 1654PROTOTYPES: ENABLE
… …
1347 cbor_init (&cbor); 1673 cbor_init (&cbor);
1348 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1674 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1349 XPUSHs (cborstr); 1675 XPUSHs (cborstr);
1350} 1676}
1351 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