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.41 by root, Tue Dec 10 14:01:52 2013 UTC vs.
Revision 1.68 by root, Mon Nov 30 18:30:29 2020 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
… …
94 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
95 100
96 CBOR_TAG_MAGIC = 55799, // self-describe cbor 101 CBOR_TAG_MAGIC = 55799, // self-describe cbor
97}; 102};
98 103
104// known forced types, also hardcoded in CBOR.pm
105enum
106{
107 AS_CBOR = 0,
108 AS_INT = 1,
109 AS_BYTES = 2,
110 AS_TEXT = 3,
111 AS_FLOAT16 = 4,
112 AS_FLOAT32 = 5,
113 AS_FLOAT64 = 6,
114 // possibly future enhancements: (generic) float, (generic) string
115};
116
99#define F_SHRINK 0x00000001UL 117#define F_SHRINK 0x00000001UL
100#define F_ALLOW_UNKNOWN 0x00000002UL 118#define F_ALLOW_UNKNOWN 0x00000002UL
101#define F_ALLOW_SHARING 0x00000004UL 119#define F_ALLOW_SHARING 0x00000004UL
102#define F_ALLOW_CYCLES 0x00000008UL 120#define F_ALLOW_CYCLES 0x00000008UL
121#define F_FORBID_OBJECTS 0x00000010UL
103#define F_PACK_STRINGS 0x00000010UL 122#define F_PACK_STRINGS 0x00000020UL
123#define F_TEXT_KEYS 0x00000040UL
124#define F_TEXT_STRINGS 0x00000080UL
104#define F_VALIDATE_UTF8 0x00000020UL 125#define F_VALIDATE_UTF8 0x00000100UL
105 126
106#define INIT_SIZE 32 // initial scalar size to be allocated 127#define INIT_SIZE 32 // initial scalar size to be allocated
107 128
108#define SB do { 129#define SB do {
109#define SE } while (0) 130#define SE } while (0)
… …
182 203
183// minimum length of a string to be registered for stringref 204// minimum length of a string to be registered for stringref
184ecb_inline int 205ecb_inline int
185minimum_string_length (UV idx) 206minimum_string_length (UV idx)
186{ 207{
187 return idx > 23 208 return idx <= 23 ? 3
188 ? idx > 0xffU 209 : idx <= 0xffU ? 4
189 ? idx > 0xffffU 210 : idx <= 0xffffU ? 5
190 ? idx > 0xffffffffU 211 : idx <= 0xffffffffU ? 7
191 ? 11 212 : 11;
192 : 7
193 : 5
194 : 4
195 : 3;
196} 213}
197 214
198///////////////////////////////////////////////////////////////////////////// 215/////////////////////////////////////////////////////////////////////////////
199// encoder 216// encoder
200 217
… …
213} enc_t; 230} enc_t;
214 231
215ecb_inline void 232ecb_inline void
216need (enc_t *enc, STRLEN len) 233need (enc_t *enc, STRLEN len)
217{ 234{
218 if (ecb_expect_false (enc->cur + len >= enc->end)) 235 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
219 { 236 {
220 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 237 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
221 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 238 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
222 enc->cur = SvPVX (enc->sv) + cur; 239 enc->cur = SvPVX (enc->sv) + cur;
223 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 240 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
229{ 246{
230 need (enc, 1); 247 need (enc, 1);
231 *enc->cur++ = ch; 248 *enc->cur++ = ch;
232} 249}
233 250
251// used for tags, intregers, element counts and so on
234static void 252static void
235encode_uint (enc_t *enc, int major, UV len) 253encode_uint (enc_t *enc, int major, UV len)
236{ 254{
237 need (enc, 9); 255 need (enc, 9);
238 256
… …
269 *enc->cur++ = len >> 8; 287 *enc->cur++ = len >> 8;
270 *enc->cur++ = len; 288 *enc->cur++ = len;
271 } 289 }
272} 290}
273 291
292// encodes a perl value into a CBOR integer
293ecb_inline void
294encode_int (enc_t *enc, SV *sv)
295{
296 if (SvIsUV (sv))
297 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
298 else if (SvIVX (sv) >= 0)
299 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
300 else
301 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
302}
303
274ecb_inline void 304ecb_inline void
275encode_tag (enc_t *enc, UV tag) 305encode_tag (enc_t *enc, UV tag)
276{ 306{
277 encode_uint (enc, MAJOR_TAG, tag); 307 encode_uint (enc, MAJOR_TAG, tag);
278} 308}
279 309
310// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
311ecb_noinline static void
312encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
313{
314 STRLEN ulen = len;
315 U8 *p, *pend = (U8 *)str + len;
316
317 for (p = (U8 *)str; p < pend; ++p)
318 ulen += *p >> 7; // count set high bits
319
320 encode_uint (enc, MAJOR_TEXT, ulen);
321
322 need (enc, ulen);
323 for (p = (U8 *)str; p < pend; ++p)
324 if (*p < 0x80)
325 *enc->cur++ = *p;
326 else
327 {
328 *enc->cur++ = 0xc0 + (*p >> 6);
329 *enc->cur++ = 0x80 + (*p & 63);
330 }
331}
332
280ecb_inline void 333ecb_inline void
281encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 334encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
282{ 335{
336 if (ecb_expect_false (upgrade_utf8))
337 if (!utf8)
338 {
339 encode_str_utf8 (enc, utf8, str, len);
340 return;
341 }
342
283 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 343 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
284 need (enc, len); 344 need (enc, len);
285 memcpy (enc->cur, str, len); 345 memcpy (enc->cur, str, len);
286 enc->cur += len; 346 enc->cur += len;
287} 347}
288 348
289static void 349ecb_inline void
290encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 350encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
291{ 351{
292 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 352 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
293 { 353 {
294 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 354 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
295 355
… …
306 sv_setuv (*svp, enc->stringref_idx); 366 sv_setuv (*svp, enc->stringref_idx);
307 ++enc->stringref_idx; 367 ++enc->stringref_idx;
308 } 368 }
309 } 369 }
310 370
311 encode_str (enc, utf8, str, len); 371 encode_str (enc, upgrade_utf8, utf8, str, len);
372}
373
374ecb_inline void
375encode_float16 (enc_t *enc, NV nv)
376{
377 need (enc, 1+2);
378
379 *enc->cur++ = MAJOR_MISC | MISC_FLOAT16;
380
381 uint16_t fp = ecb_float_to_binary16 (nv);
382
383 if (!ecb_big_endian ())
384 fp = ecb_bswap16 (fp);
385
386 memcpy (enc->cur, &fp, 2);
387 enc->cur += 2;
388}
389
390ecb_inline void
391encode_float32 (enc_t *enc, NV nv)
392{
393 need (enc, 1+4);
394
395 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
396
397 uint32_t fp = ecb_float_to_binary32 (nv);
398
399 if (!ecb_big_endian ())
400 fp = ecb_bswap32 (fp);
401
402 memcpy (enc->cur, &fp, 4);
403 enc->cur += 4;
404}
405
406ecb_inline void
407encode_float64 (enc_t *enc, NV nv)
408{
409 need (enc, 1+8);
410
411 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
412
413 uint64_t fp = ecb_double_to_binary64 (nv);
414
415 if (!ecb_big_endian ())
416 fp = ecb_bswap64 (fp);
417
418 memcpy (enc->cur, &fp, 8);
419 enc->cur += 8;
420}
421
422ecb_inline void
423encode_forced (enc_t *enc, UV type, SV *sv)
424{
425 switch (type)
426 {
427 case AS_CBOR:
428 {
429 STRLEN len;
430 char *str = SvPVbyte (sv, len);
431
432 need (enc, len);
433 memcpy (enc->cur, str, len);
434 enc->cur += len;
435 }
436 break;
437
438 case AS_BYTES:
439 {
440 STRLEN len;
441 char *str = SvPVbyte (sv, len);
442 encode_strref (enc, 0, 0, str, len);
443 }
444 break;
445
446 case AS_TEXT:
447 {
448 STRLEN len;
449 char *str = SvPVutf8 (sv, len);
450 encode_strref (enc, 1, 1, str, len);
451 }
452 break;
453
454 case AS_INT: encode_int (enc, sv); break;
455 case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break;
456 case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break;
457 case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break;
458
459 default:
460 croak ("encountered malformed CBOR::XS::Tagged object");
461 }
312} 462}
313 463
314static void encode_sv (enc_t *enc, SV *sv); 464static void encode_sv (enc_t *enc, SV *sv);
315 465
316static void 466static void
… …
323 473
324 ++enc->depth; 474 ++enc->depth;
325 475
326 encode_uint (enc, MAJOR_ARRAY, len + 1); 476 encode_uint (enc, MAJOR_ARRAY, len + 1);
327 477
478 if (ecb_expect_false (SvMAGICAL (av)))
328 for (i = 0; i <= len; ++i) 479 for (i = 0; i <= len; ++i)
329 { 480 {
330 SV **svp = av_fetch (av, i, 0); 481 SV **svp = av_fetch (av, i, 0);
331 encode_sv (enc, svp ? *svp : &PL_sv_undef); 482 encode_sv (enc, svp ? *svp : &PL_sv_undef);
332 } 483 }
484 else
485 for (i = 0; i <= len; ++i)
486 {
487 SV *sv = AvARRAY (av)[i];
488 encode_sv (enc, sv ? sv : &PL_sv_undef);
489 }
333 490
334 --enc->depth; 491 --enc->depth;
335} 492}
336 493
337static void 494static void
… …
345 ++enc->depth; 502 ++enc->depth;
346 503
347 int pairs = hv_iterinit (hv); 504 int pairs = hv_iterinit (hv);
348 int mg = SvMAGICAL (hv); 505 int mg = SvMAGICAL (hv);
349 506
350 if (mg) 507 if (ecb_expect_false (mg))
351 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 508 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
352 else 509 else
353 encode_uint (enc, MAJOR_MAP, pairs); 510 encode_uint (enc, MAJOR_MAP, pairs);
354 511
355 while ((he = hv_iternext (hv))) 512 while ((he = hv_iternext (hv)))
356 { 513 {
357 if (HeKLEN (he) == HEf_SVKEY) 514 if (HeKLEN (he) == HEf_SVKEY)
358 encode_sv (enc, HeSVKEY (he)); 515 encode_sv (enc, HeSVKEY (he));
359 else 516 else
360 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 517 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
361 518
362 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 519 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
363 } 520 }
364 521
365 if (mg) 522 if (ecb_expect_false (mg))
366 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 523 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
367 524
368 --enc->depth; 525 --enc->depth;
369} 526}
370 527
… …
403 else if (stash == tagged_stash) 560 else if (stash == tagged_stash)
404 { 561 {
405 if (svt != SVt_PVAV) 562 if (svt != SVt_PVAV)
406 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 563 croak ("encountered CBOR::XS::Tagged object that isn't an array");
407 564
565 switch (av_len ((AV *)sv))
566 {
567 case 2-1:
568 // actually a tagged value
408 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); 569 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
409 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 570 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
571 break;
572
573 case 3-1:
574 // a forced type [value, type, undef]
575 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
576 break;
577
578 default:
579 croak ("encountered malformed CBOR::XS::Tagged object");
580 }
410 581
411 return; 582 return;
412 } 583 }
413 } 584 }
414 585
415 if (ecb_expect_false (SvREFCNT (sv) > 1) 586 if (ecb_expect_false (SvREFCNT (sv) > 1)
416 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 587 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
417 { 588 {
418 if (!enc->shareable) 589 if (ecb_expect_false (!enc->shareable))
419 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 590 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
420 591
421 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 592 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
422 593
423 if (SvOK (*svp)) 594 if (SvOK (*svp))
… …
437 if (ecb_expect_false (SvOBJECT (sv))) 608 if (ecb_expect_false (SvOBJECT (sv)))
438 { 609 {
439 HV *stash = SvSTASH (sv); 610 HV *stash = SvSTASH (sv);
440 GV *method; 611 GV *method;
441 612
613 if (enc->cbor.flags & F_FORBID_OBJECTS)
614 croak ("encountered object '%s', but forbid_objects is enabled",
615 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
442 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 616 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
443 { 617 {
444 dSP; 618 dSP;
445 619
446 ENTER; SAVETMPS; PUSHMARK (SP); 620 ENTER; SAVETMPS;
621 PUSHMARK (SP);
447 // we re-bless the reference to get overload and other niceties right 622 // we re-bless the reference to get overload and other niceties right
448 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 623 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
449 624
450 PUTBACK; 625 PUTBACK;
451 // G_SCALAR ensures that return value is 1 626 // G_SCALAR ensures that return value is 1
… …
464 } 639 }
465 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 640 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
466 { 641 {
467 dSP; 642 dSP;
468 643
469 ENTER; SAVETMPS; PUSHMARK (SP); 644 ENTER; SAVETMPS;
645 PUSHMARK (SP);
470 EXTEND (SP, 2); 646 EXTEND (SP, 2);
471 // we re-bless the reference to get overload and other niceties right 647 // we re-bless the reference to get overload and other niceties right
472 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 648 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
473 PUSHs (sv_cbor); 649 PUSHs (sv_cbor);
474 650
… …
480 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 656 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
481 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 657 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
482 658
483 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 659 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
484 encode_uint (enc, MAJOR_ARRAY, count + 1); 660 encode_uint (enc, MAJOR_ARRAY, count + 1);
485 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 661 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
486 662
487 while (count) 663 {
664 int i;
665
666 for (i = 0; i < count; ++i)
488 encode_sv (enc, SP[1 - count--]); 667 encode_sv (enc, SP[i + 1 - count]);
668
669 SP -= count;
670 }
489 671
490 PUTBACK; 672 PUTBACK;
491 673
492 FREETMPS; LEAVE; 674 FREETMPS; LEAVE;
493 } 675 }
… …
515 697
516 if (ecb_expect_false (nv == (NV)(U32)nv)) 698 if (ecb_expect_false (nv == (NV)(U32)nv))
517 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 699 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
518 //TODO: maybe I32? 700 //TODO: maybe I32?
519 else if (ecb_expect_false (nv == (float)nv)) 701 else if (ecb_expect_false (nv == (float)nv))
520 { 702 encode_float32 (enc, nv);
521 uint32_t fp = ecb_float_to_binary32 (nv);
522
523 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
524
525 if (!ecb_big_endian ())
526 fp = ecb_bswap32 (fp);
527
528 memcpy (enc->cur, &fp, 4);
529 enc->cur += 4;
530 }
531 else 703 else
532 { 704 encode_float64 (enc, nv);
533 uint64_t fp = ecb_double_to_binary64 (nv);
534
535 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
536
537 if (!ecb_big_endian ())
538 fp = ecb_bswap64 (fp);
539
540 memcpy (enc->cur, &fp, 8);
541 enc->cur += 8;
542 }
543} 705}
544 706
545static void 707static void
546encode_sv (enc_t *enc, SV *sv) 708encode_sv (enc_t *enc, SV *sv)
547{ 709{
… …
549 711
550 if (SvPOKp (sv)) 712 if (SvPOKp (sv))
551 { 713 {
552 STRLEN len; 714 STRLEN len;
553 char *str = SvPV (sv, len); 715 char *str = SvPV (sv, len);
554 encode_strref (enc, SvUTF8 (sv), str, len); 716 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
555 } 717 }
556 else if (SvNOKp (sv)) 718 else if (SvNOKp (sv))
557 encode_nv (enc, sv); 719 encode_nv (enc, sv);
558 else if (SvIOKp (sv)) 720 else if (SvIOKp (sv))
559 { 721 encode_int (enc, sv);
560 if (SvIsUV (sv))
561 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
562 else if (SvIVX (sv) >= 0)
563 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
564 else
565 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
566 }
567 else if (SvROK (sv)) 722 else if (SvROK (sv))
568 encode_rv (enc, SvRV (sv)); 723 encode_rv (enc, SvRV (sv));
569 else if (!SvOK (sv)) 724 else if (!SvOK (sv))
570 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 725 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
571 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 726 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
576} 731}
577 732
578static SV * 733static SV *
579encode_cbor (SV *scalar, CBOR *cbor) 734encode_cbor (SV *scalar, CBOR *cbor)
580{ 735{
581 enc_t enc = { }; 736 enc_t enc = { 0 };
582 737
583 enc.cbor = *cbor; 738 enc.cbor = *cbor;
584 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 739 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
585 enc.cur = SvPVX (enc.sv); 740 enc.cur = SvPVX (enc.sv);
586 enc.end = SvEND (enc.sv); 741 enc.end = SvEND (enc.sv);
587 742
588 SvPOK_only (enc.sv); 743 SvPOK_only (enc.sv);
589 744
590 if (cbor->flags & F_PACK_STRINGS) 745 if (cbor->flags & F_PACK_STRINGS)
591 { 746 {
… …
618 U32 depth; // recursion depth 773 U32 depth; // recursion depth
619 U32 maxdepth; // recursion depth limit 774 U32 maxdepth; // recursion depth limit
620 AV *shareable; 775 AV *shareable;
621 AV *stringref; 776 AV *stringref;
622 SV *decode_tagged; 777 SV *decode_tagged;
778 SV *err_sv; // optional sv for error, needs to be freed
623} dec_t; 779} dec_t;
624 780
625#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 781// set dec->err to ERRSV
782ecb_cold static void
783err_errsv (dec_t *dec)
784{
785 if (!dec->err)
786 {
787 dec->err_sv = newSVsv (ERRSV);
626 788
627#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 789 // chop off the trailing \n
790 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
791 *SvEND (dec->err_sv) = 0;
628 792
793 dec->err = SvPVutf8_nolen (dec->err_sv);
794 }
795}
796
797// the following functions are used to reduce code size and help the compiler to optimise
798ecb_cold static void
799err_set (dec_t *dec, const char *reason)
800{
801 if (!dec->err)
802 dec->err = reason;
803}
804
805ecb_cold static void
806err_unexpected_end (dec_t *dec)
807{
808 err_set (dec, "unexpected end of CBOR data");
809}
810
811#define ERR_DO(do) SB do; goto fail; SE
812#define ERR(reason) ERR_DO (err_set (dec, reason))
813#define ERR_ERRSV ERR_DO (err_errsv (dec))
814
815#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
816
629#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 817#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
630#define DEC_DEC_DEPTH --dec->depth 818#define DEC_DEC_DEPTH --dec->depth
631 819
632static UV 820static UV
633decode_uint (dec_t *dec) 821decode_uint (dec_t *dec)
634{ 822{
… …
700 888
701 for (;;) 889 for (;;)
702 { 890 {
703 WANT (1); 891 WANT (1);
704 892
705 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 893 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
706 { 894 {
707 ++dec->cur; 895 ++dec->cur;
708 break; 896 break;
709 } 897 }
710 898
711 av_push (av, decode_sv (dec)); 899 av_push (av, decode_sv (dec));
712 } 900 }
713 } 901 }
714 else 902 else
715 { 903 {
716 int i, len = decode_uint (dec); 904 UV i, len = decode_uint (dec);
717 905
718 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 906 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
719 av_fill (av, len - 1); 907 av_fill (av, len - 1);
720 908
721 for (i = 0; i < len; ++i) 909 for (i = 0; i < len; ++i)
… …
724 912
725 DEC_DEC_DEPTH; 913 DEC_DEC_DEPTH;
726 return newRV_noinc ((SV *)av); 914 return newRV_noinc ((SV *)av);
727 915
728fail: 916fail:
729 SvREFCNT_dec (av); 917 SvREFCNT_dec_NN (av);
730 DEC_DEC_DEPTH; 918 DEC_DEC_DEPTH;
731 return &PL_sv_undef; 919 return &PL_sv_undef;
732} 920}
733 921
734static void 922static void
… …
736{ 924{
737 // for speed reasons, we specialcase single-string 925 // for speed reasons, we specialcase single-string
738 // byte or utf-8 strings as keys, but only when !stringref 926 // byte or utf-8 strings as keys, but only when !stringref
739 927
740 if (ecb_expect_true (!dec->stringref)) 928 if (ecb_expect_true (!dec->stringref))
741 if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 929 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
742 { 930 {
743 I32 len = decode_uint (dec); 931 STRLEN len = decode_uint (dec);
744 char *key = (char *)dec->cur; 932 char *key = (char *)dec->cur;
745 933
934 WANT (len);
746 dec->cur += len; 935 dec->cur += len;
747 936
748 hv_store (hv, key, len, decode_sv (dec), 0); 937 hv_store (hv, key, len, decode_sv (dec), 0);
749 938
750 return; 939 return;
751 } 940 }
752 else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 941 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
753 { 942 {
754 I32 len = decode_uint (dec); 943 STRLEN len = decode_uint (dec);
755 char *key = (char *)dec->cur; 944 char *key = (char *)dec->cur;
756 945
946 WANT (len);
757 dec->cur += len; 947 dec->cur += len;
758 948
759 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 949 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
760 if (!is_utf8_string (key, len)) 950 if (!is_utf8_string (key, len))
761 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 951 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
… …
766 } 956 }
767 957
768 SV *k = decode_sv (dec); 958 SV *k = decode_sv (dec);
769 SV *v = decode_sv (dec); 959 SV *v = decode_sv (dec);
770 960
961 // we leak memory if uncaught exceptions are thrown by random magical
962 // methods, and this is hopefully the only place where it can happen,
963 // so if there is a chance of an exception, take the very slow path.
964 // since catching exceptions is "undocumented/internal/forbidden" by
965 // the new p5p powers, we need to call out to a perl function :/
966 if (ecb_expect_false (SvAMAGIC (k)))
967 {
968 dSP;
969
970 ENTER; SAVETMPS;
971 PUSHMARK (SP);
972 EXTEND (SP, 3);
973 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
974 PUSHs (sv_2mortal (k));
975 PUSHs (sv_2mortal (v));
976
977 PUTBACK;
978 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
979 SPAGAIN;
980
981 FREETMPS; LEAVE;
982
983 if (SvTRUE (ERRSV))
984 ERR_ERRSV;
985
986 return;
987 }
988
771 hv_store_ent (hv, k, v, 0); 989 hv_store_ent (hv, k, v, 0);
772 SvREFCNT_dec (k); 990 SvREFCNT_dec_NN (k);
773 991
774fail: 992fail:
775 ; 993 ;
776} 994}
777 995
… …
788 1006
789 for (;;) 1007 for (;;)
790 { 1008 {
791 WANT (1); 1009 WANT (1);
792 1010
793 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1011 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
794 { 1012 {
795 ++dec->cur; 1013 ++dec->cur;
796 break; 1014 break;
797 } 1015 }
798 1016
799 decode_he (dec, hv); 1017 decode_he (dec, hv);
800 } 1018 }
801 } 1019 }
802 else 1020 else
803 { 1021 {
804 int pairs = decode_uint (dec); 1022 UV pairs = decode_uint (dec);
1023
1024 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
805 1025
806 while (pairs--) 1026 while (pairs--)
807 decode_he (dec, hv); 1027 decode_he (dec, hv);
808 } 1028 }
809 1029
810 DEC_DEC_DEPTH; 1030 DEC_DEC_DEPTH;
811 return newRV_noinc ((SV *)hv); 1031 return newRV_noinc ((SV *)hv);
812 1032
813fail: 1033fail:
814 SvREFCNT_dec (hv); 1034 SvREFCNT_dec_NN (hv);
815 DEC_DEC_DEPTH; 1035 DEC_DEC_DEPTH;
816 return &PL_sv_undef; 1036 return &PL_sv_undef;
817} 1037}
818 1038
819static SV * 1039static SV *
820decode_str (dec_t *dec, int utf8) 1040decode_str (dec_t *dec, int utf8)
821{ 1041{
822 SV *sv = 0; 1042 SV *sv = 0;
823 1043
824 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1044 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
825 { 1045 {
826 // indefinite length strings 1046 // indefinite length strings
827 ++dec->cur; 1047 ++dec->cur;
828 1048
829 U8 major = *dec->cur & MAJOR_MISC; 1049 U8 major = *dec->cur & MAJOR_MISC;
… …
897 sv = newRV_noinc (decode_sv (dec)); 1117 sv = newRV_noinc (decode_sv (dec));
898 break; 1118 break;
899 1119
900 case CBOR_TAG_STRINGREF_NAMESPACE: 1120 case CBOR_TAG_STRINGREF_NAMESPACE:
901 { 1121 {
1122 // do not use SAVETMPS/FREETMPS, as these will
1123 // erase mortalised caches, e.g. "shareable"
902 ENTER; SAVETMPS; 1124 ENTER;
903 1125
904 SAVESPTR (dec->stringref); 1126 SAVESPTR (dec->stringref);
905 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1127 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
906 1128
907 sv = decode_sv (dec); 1129 sv = decode_sv (dec);
908 1130
909 FREETMPS; LEAVE; 1131 LEAVE;
910 } 1132 }
911 break; 1133 break;
912 1134
913 case CBOR_TAG_STRINGREF: 1135 case CBOR_TAG_STRINGREF:
914 { 1136 {
915 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1137 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
916 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1138 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
917 1139
918 UV idx = decode_uint (dec); 1140 UV idx = decode_uint (dec);
919 1141
920 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1142 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
921 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1143 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
922 1144
923 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1145 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
924 } 1146 }
925 break; 1147 break;
… …
953 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1175 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
954 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1176 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
955 1177
956 UV idx = decode_uint (dec); 1178 UV idx = decode_uint (dec);
957 1179
958 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1180 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
959 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1181 ERR ("corrupted CBOR data (sharedref index out of bounds)");
960 1182
961 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1183 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
962 1184
963 if (sv == &PL_sv_undef) 1185 if (sv == &PL_sv_undef)
… …
965 } 1187 }
966 break; 1188 break;
967 1189
968 case CBOR_TAG_PERL_OBJECT: 1190 case CBOR_TAG_PERL_OBJECT:
969 { 1191 {
1192 if (dec->cbor.flags & F_FORBID_OBJECTS)
1193 goto filter;
1194
970 sv = decode_sv (dec); 1195 sv = decode_sv (dec);
971 1196
972 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1197 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
973 ERR ("corrupted CBOR data (non-array perl object)"); 1198 ERR ("corrupted CBOR data (non-array perl object)");
974 1199
… …
984 if (!method) 1209 if (!method)
985 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1210 ERR ("cannot decode perl-object (package does not have a THAW method)");
986 1211
987 dSP; 1212 dSP;
988 1213
989 ENTER; SAVETMPS; PUSHMARK (SP); 1214 ENTER; SAVETMPS;
1215 PUSHMARK (SP);
990 EXTEND (SP, len + 1); 1216 EXTEND (SP, len + 1);
991 // we re-bless the reference to get overload and other niceties right 1217 // we re-bless the reference to get overload and other niceties right
992 PUSHs (*av_fetch (av, 0, 1)); 1218 PUSHs (*av_fetch (av, 0, 1));
993 PUSHs (sv_cbor); 1219 PUSHs (sv_cbor);
994 1220
… …
1002 SPAGAIN; 1228 SPAGAIN;
1003 1229
1004 if (SvTRUE (ERRSV)) 1230 if (SvTRUE (ERRSV))
1005 { 1231 {
1006 FREETMPS; LEAVE; 1232 FREETMPS; LEAVE;
1007 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1233 ERR_ERRSV;
1008 } 1234 }
1009 1235
1010 SvREFCNT_dec (sv); 1236 SvREFCNT_dec_NN (sv);
1011 sv = SvREFCNT_inc (POPs); 1237 sv = SvREFCNT_inc (POPs);
1012 1238
1013 PUTBACK; 1239 PUTBACK;
1014 1240
1015 FREETMPS; LEAVE; 1241 FREETMPS; LEAVE;
1016 } 1242 }
1017 break; 1243 break;
1018 1244
1019 default: 1245 default:
1246 filter:
1020 { 1247 {
1248 SV *tag_sv = newSVuv (tag);
1249
1021 sv = decode_sv (dec); 1250 sv = decode_sv (dec);
1022 1251
1023 dSP; 1252 dSP;
1024 ENTER; SAVETMPS; PUSHMARK (SP); 1253 ENTER; SAVETMPS;
1254 PUSHMARK (SP);
1025 EXTEND (SP, 2); 1255 EXTEND (SP, 2);
1026 PUSHs (newSVuv (tag)); 1256 PUSHs (tag_sv);
1027 PUSHs (sv); 1257 PUSHs (sv);
1028 1258
1029 PUTBACK; 1259 PUTBACK;
1030 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1260 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1031 SPAGAIN; 1261 SPAGAIN;
1032 1262
1033 if (SvTRUE (ERRSV)) 1263 if (SvTRUE (ERRSV))
1034 { 1264 {
1265 SvREFCNT_dec_NN (tag_sv);
1035 FREETMPS; LEAVE; 1266 FREETMPS; LEAVE;
1036 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1267 ERR_ERRSV;
1037 } 1268 }
1038 1269
1039 if (count) 1270 if (count)
1040 { 1271 {
1272 SvREFCNT_dec_NN (tag_sv);
1041 SvREFCNT_dec (sv); 1273 SvREFCNT_dec_NN (sv);
1042 sv = SvREFCNT_inc (POPs); 1274 sv = SvREFCNT_inc_NN (TOPs);
1275 SP -= count;
1043 } 1276 }
1044 else 1277 else
1045 { 1278 {
1046 AV *av = newAV (); 1279 AV *av = newAV ();
1047 av_push (av, newSVuv (tag)); 1280 av_push (av, tag_sv);
1048 av_push (av, sv); 1281 av_push (av, sv);
1049 1282
1050 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1283 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1051 ? cbor_tagged_stash 1284 ? cbor_tagged_stash
1052 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1285 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1155} 1388}
1156 1389
1157static SV * 1390static SV *
1158decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1391decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1159{ 1392{
1160 dec_t dec = { }; 1393 dec_t dec = { 0 };
1161 SV *sv; 1394 SV *sv;
1162 STRLEN len; 1395 STRLEN len;
1163 char *data = SvPVbyte (string, len); 1396 char *data = SvPVbyte (string, len);
1164 1397
1165 if (len > cbor->max_size && cbor->max_size) 1398 if (len > cbor->max_size && cbor->max_size)
… …
1181 1414
1182 if (dec.err) 1415 if (dec.err)
1183 { 1416 {
1184 if (dec.shareable) 1417 if (dec.shareable)
1185 { 1418 {
1186 // need to break cyclic links, which whould all be in shareable 1419 // need to break cyclic links, which would all be in shareable
1187 int i; 1420 int i;
1188 SV **svp; 1421 SV **svp;
1189 1422
1190 for (i = av_len (dec.shareable) + 1; i--; ) 1423 for (i = av_len (dec.shareable) + 1; i--; )
1191 if ((svp = av_fetch (dec.shareable, i, 0))) 1424 if ((svp = av_fetch (dec.shareable, i, 0)))
1192 sv_setsv (*svp, &PL_sv_undef); 1425 sv_setsv (*svp, &PL_sv_undef);
1193 } 1426 }
1194 1427
1195 SvREFCNT_dec (sv); 1428 SvREFCNT_dec_NN (sv);
1429
1430 if (dec.err_sv)
1431 sv_2mortal (dec.err_sv);
1432
1196 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1433 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1197 } 1434 }
1198 1435
1199 sv = sv_2mortal (sv); 1436 sv = sv_2mortal (sv);
1200 1437
… …
1256 1493
1257 int major = *p >> MAJOR_SHIFT; 1494 int major = *p >> MAJOR_SHIFT;
1258 1495
1259 switch (major) 1496 switch (major)
1260 { 1497 {
1498 case MAJOR_TAG >> MAJOR_SHIFT:
1499 ++count; // tags merely prefix another value
1500 break;
1501
1261 case MAJOR_BYTES >> MAJOR_SHIFT: 1502 case MAJOR_BYTES >> MAJOR_SHIFT:
1262 case MAJOR_TEXT >> MAJOR_SHIFT: 1503 case MAJOR_TEXT >> MAJOR_SHIFT:
1263 case MAJOR_ARRAY >> MAJOR_SHIFT: 1504 case MAJOR_ARRAY >> MAJOR_SHIFT:
1264 case MAJOR_MAP >> MAJOR_SHIFT: 1505 case MAJOR_MAP >> MAJOR_SHIFT:
1265 { 1506 {
… …
1340 1581
1341 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1582 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1342 1583
1343 sv_cbor = newSVpv ("CBOR", 0); 1584 sv_cbor = newSVpv ("CBOR", 0);
1344 SvREADONLY_on (sv_cbor); 1585 SvREADONLY_on (sv_cbor);
1586
1587 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1345} 1588}
1346 1589
1347PROTOTYPES: DISABLE 1590PROTOTYPES: DISABLE
1348 1591
1349void CLONE (...) 1592void CLONE (...)
… …
1369 ALIAS: 1612 ALIAS:
1370 shrink = F_SHRINK 1613 shrink = F_SHRINK
1371 allow_unknown = F_ALLOW_UNKNOWN 1614 allow_unknown = F_ALLOW_UNKNOWN
1372 allow_sharing = F_ALLOW_SHARING 1615 allow_sharing = F_ALLOW_SHARING
1373 allow_cycles = F_ALLOW_CYCLES 1616 allow_cycles = F_ALLOW_CYCLES
1617 forbid_objects = F_FORBID_OBJECTS
1374 pack_strings = F_PACK_STRINGS 1618 pack_strings = F_PACK_STRINGS
1619 text_keys = F_TEXT_KEYS
1620 text_strings = F_TEXT_STRINGS
1375 validate_utf8 = F_VALIDATE_UTF8 1621 validate_utf8 = F_VALIDATE_UTF8
1376 PPCODE: 1622 PPCODE:
1377{ 1623{
1378 if (enable) 1624 if (enable)
1379 self->flags |= ix; 1625 self->flags |= ix;
… …
1387 ALIAS: 1633 ALIAS:
1388 get_shrink = F_SHRINK 1634 get_shrink = F_SHRINK
1389 get_allow_unknown = F_ALLOW_UNKNOWN 1635 get_allow_unknown = F_ALLOW_UNKNOWN
1390 get_allow_sharing = F_ALLOW_SHARING 1636 get_allow_sharing = F_ALLOW_SHARING
1391 get_allow_cycles = F_ALLOW_CYCLES 1637 get_allow_cycles = F_ALLOW_CYCLES
1638 get_forbid_objects = F_FORBID_OBJECTS
1392 get_pack_strings = F_PACK_STRINGS 1639 get_pack_strings = F_PACK_STRINGS
1640 get_text_keys = F_TEXT_KEYS
1641 get_text_strings = F_TEXT_STRINGS
1393 get_validate_utf8 = F_VALIDATE_UTF8 1642 get_validate_utf8 = F_VALIDATE_UTF8
1394 PPCODE: 1643 PPCODE:
1395 XPUSHs (boolSV (self->flags & ix)); 1644 XPUSHs (boolSV (self->flags & ix));
1396 1645
1397void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1646void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
… …
1448 PUSHs (sv); 1697 PUSHs (sv);
1449 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1698 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1450} 1699}
1451 1700
1452void incr_parse (CBOR *self, SV *cborstr) 1701void incr_parse (CBOR *self, SV *cborstr)
1702 ALIAS:
1703 incr_parse_multiple = 1
1453 PPCODE: 1704 PPCODE:
1454{ 1705{
1455 if (SvUTF8 (cborstr)) 1706 if (SvUTF8 (cborstr))
1456 sv_utf8_downgrade (cborstr, 0); 1707 sv_utf8_downgrade (cborstr, 0);
1457 1708
… …
1487 av_push (self->incr_count, newSViv (1)); 1738 av_push (self->incr_count, newSViv (1));
1488 1739
1489 self->incr_pos = 0; 1740 self->incr_pos = 0;
1490 self->incr_need = self->incr_pos + 1; 1741 self->incr_need = self->incr_pos + 1;
1491 } 1742 }
1492 while (GIMME_V == G_ARRAY); 1743 while (ix);
1493} 1744}
1494 1745
1495void incr_reset (CBOR *self) 1746void incr_reset (CBOR *self)
1496 CODE: 1747 CODE:
1497{ 1748{
… …
1525 cbor_init (&cbor); 1776 cbor_init (&cbor);
1526 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1777 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1527 XPUSHs (cborstr); 1778 XPUSHs (cborstr);
1528} 1779}
1529 1780
1781#ifdef __AFL_COMPILER
1782
1783void
1784afl_init ()
1785 CODE:
1786 __AFL_INIT ();
1787
1788int
1789afl_loop (unsigned int count = 10000)
1790 CODE:
1791 RETVAL = __AFL_LOOP (count);
1792 OUTPUT:
1793 RETVAL
1794
1795#endif
1796

Diff Legend

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