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.69 by root, Mon Nov 30 20:38:25 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_bool (enc_t *enc, int istrue)
424{
425 encode_ch (enc, istrue ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
426}
427
428ecb_inline void
429encode_forced (enc_t *enc, UV type, SV *sv)
430{
431 switch (type)
432 {
433 case AS_CBOR:
434 {
435 STRLEN len;
436 char *str = SvPVbyte (sv, len);
437
438 need (enc, len);
439 memcpy (enc->cur, str, len);
440 enc->cur += len;
441 }
442 break;
443
444 case AS_BYTES:
445 {
446 STRLEN len;
447 char *str = SvPVbyte (sv, len);
448 encode_strref (enc, 0, 0, str, len);
449 }
450 break;
451
452 case AS_TEXT:
453 {
454 STRLEN len;
455 char *str = SvPVutf8 (sv, len);
456 encode_strref (enc, 1, 1, str, len);
457 }
458 break;
459
460 case AS_INT: encode_int (enc, sv); break;
461
462 case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break;
463 case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break;
464 case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break;
465
466 default:
467 croak ("encountered malformed CBOR::XS::Tagged object");
468 }
312} 469}
313 470
314static void encode_sv (enc_t *enc, SV *sv); 471static void encode_sv (enc_t *enc, SV *sv);
315 472
316static void 473static void
… …
323 480
324 ++enc->depth; 481 ++enc->depth;
325 482
326 encode_uint (enc, MAJOR_ARRAY, len + 1); 483 encode_uint (enc, MAJOR_ARRAY, len + 1);
327 484
485 if (ecb_expect_false (SvMAGICAL (av)))
328 for (i = 0; i <= len; ++i) 486 for (i = 0; i <= len; ++i)
329 { 487 {
330 SV **svp = av_fetch (av, i, 0); 488 SV **svp = av_fetch (av, i, 0);
331 encode_sv (enc, svp ? *svp : &PL_sv_undef); 489 encode_sv (enc, svp ? *svp : &PL_sv_undef);
332 } 490 }
491 else
492 for (i = 0; i <= len; ++i)
493 {
494 SV *sv = AvARRAY (av)[i];
495 encode_sv (enc, sv ? sv : &PL_sv_undef);
496 }
333 497
334 --enc->depth; 498 --enc->depth;
335} 499}
336 500
337static void 501static void
… …
345 ++enc->depth; 509 ++enc->depth;
346 510
347 int pairs = hv_iterinit (hv); 511 int pairs = hv_iterinit (hv);
348 int mg = SvMAGICAL (hv); 512 int mg = SvMAGICAL (hv);
349 513
350 if (mg) 514 if (ecb_expect_false (mg))
351 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 515 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
352 else 516 else
353 encode_uint (enc, MAJOR_MAP, pairs); 517 encode_uint (enc, MAJOR_MAP, pairs);
354 518
355 while ((he = hv_iternext (hv))) 519 while ((he = hv_iternext (hv)))
356 { 520 {
357 if (HeKLEN (he) == HEf_SVKEY) 521 if (HeKLEN (he) == HEf_SVKEY)
358 encode_sv (enc, HeSVKEY (he)); 522 encode_sv (enc, HeSVKEY (he));
359 else 523 else
360 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 524 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
361 525
362 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 526 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
363 } 527 }
364 528
365 if (mg) 529 if (ecb_expect_false (mg))
366 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 530 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
367 531
368 --enc->depth; 532 --enc->depth;
369} 533}
370 534
… …
390 554
391 HV *stash = SvSTASH (sv); 555 HV *stash = SvSTASH (sv);
392 556
393 if (stash == boolean_stash) 557 if (stash == boolean_stash)
394 { 558 {
395 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE); 559 encode_bool (enc, SvIV (sv));
396 return; 560 return;
397 } 561 }
398 else if (stash == error_stash) 562 else if (stash == error_stash)
399 { 563 {
400 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF); 564 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
… …
403 else if (stash == tagged_stash) 567 else if (stash == tagged_stash)
404 { 568 {
405 if (svt != SVt_PVAV) 569 if (svt != SVt_PVAV)
406 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 570 croak ("encountered CBOR::XS::Tagged object that isn't an array");
407 571
572 switch (av_len ((AV *)sv))
573 {
574 case 2-1:
575 // actually a tagged value
408 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); 576 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
409 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 577 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
578 break;
579
580 case 3-1:
581 // a forced type [value, type, undef]
582 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
583 break;
584
585 default:
586 croak ("encountered malformed CBOR::XS::Tagged object");
587 }
410 588
411 return; 589 return;
412 } 590 }
413 } 591 }
414 592
415 if (ecb_expect_false (SvREFCNT (sv) > 1) 593 if (ecb_expect_false (SvREFCNT (sv) > 1)
416 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 594 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
417 { 595 {
418 if (!enc->shareable) 596 if (ecb_expect_false (!enc->shareable))
419 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 597 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
420 598
421 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 599 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
422 600
423 if (SvOK (*svp)) 601 if (SvOK (*svp))
… …
437 if (ecb_expect_false (SvOBJECT (sv))) 615 if (ecb_expect_false (SvOBJECT (sv)))
438 { 616 {
439 HV *stash = SvSTASH (sv); 617 HV *stash = SvSTASH (sv);
440 GV *method; 618 GV *method;
441 619
620 if (enc->cbor.flags & F_FORBID_OBJECTS)
621 croak ("encountered object '%s', but forbid_objects is enabled",
622 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
442 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 623 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
443 { 624 {
444 dSP; 625 dSP;
445 626
446 ENTER; SAVETMPS; PUSHMARK (SP); 627 ENTER; SAVETMPS;
628 PUSHMARK (SP);
447 // we re-bless the reference to get overload and other niceties right 629 // we re-bless the reference to get overload and other niceties right
448 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 630 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
449 631
450 PUTBACK; 632 PUTBACK;
451 // G_SCALAR ensures that return value is 1 633 // G_SCALAR ensures that return value is 1
… …
464 } 646 }
465 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 647 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
466 { 648 {
467 dSP; 649 dSP;
468 650
469 ENTER; SAVETMPS; PUSHMARK (SP); 651 ENTER; SAVETMPS;
652 PUSHMARK (SP);
470 EXTEND (SP, 2); 653 EXTEND (SP, 2);
471 // we re-bless the reference to get overload and other niceties right 654 // we re-bless the reference to get overload and other niceties right
472 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 655 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
473 PUSHs (sv_cbor); 656 PUSHs (sv_cbor);
474 657
… …
480 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 663 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)); 664 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
482 665
483 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 666 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
484 encode_uint (enc, MAJOR_ARRAY, count + 1); 667 encode_uint (enc, MAJOR_ARRAY, count + 1);
485 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 668 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
486 669
487 while (count) 670 {
671 int i;
672
673 for (i = 0; i < count; ++i)
488 encode_sv (enc, SP[1 - count--]); 674 encode_sv (enc, SP[i + 1 - count]);
675
676 SP -= count;
677 }
489 678
490 PUTBACK; 679 PUTBACK;
491 680
492 FREETMPS; LEAVE; 681 FREETMPS; LEAVE;
493 } 682 }
… …
515 704
516 if (ecb_expect_false (nv == (NV)(U32)nv)) 705 if (ecb_expect_false (nv == (NV)(U32)nv))
517 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 706 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
518 //TODO: maybe I32? 707 //TODO: maybe I32?
519 else if (ecb_expect_false (nv == (float)nv)) 708 else if (ecb_expect_false (nv == (float)nv))
520 { 709 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 710 else
532 { 711 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} 712}
544 713
545static void 714static void
546encode_sv (enc_t *enc, SV *sv) 715encode_sv (enc_t *enc, SV *sv)
547{ 716{
… …
549 718
550 if (SvPOKp (sv)) 719 if (SvPOKp (sv))
551 { 720 {
552 STRLEN len; 721 STRLEN len;
553 char *str = SvPV (sv, len); 722 char *str = SvPV (sv, len);
554 encode_strref (enc, SvUTF8 (sv), str, len); 723 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
555 } 724 }
556 else if (SvNOKp (sv)) 725 else if (SvNOKp (sv))
557 encode_nv (enc, sv); 726 encode_nv (enc, sv);
558 else if (SvIOKp (sv)) 727 else if (SvIOKp (sv))
559 { 728 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)) 729 else if (SvROK (sv))
568 encode_rv (enc, SvRV (sv)); 730 encode_rv (enc, SvRV (sv));
569 else if (!SvOK (sv)) 731 else if (!SvOK (sv))
570 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 732 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
571 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 733 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
576} 738}
577 739
578static SV * 740static SV *
579encode_cbor (SV *scalar, CBOR *cbor) 741encode_cbor (SV *scalar, CBOR *cbor)
580{ 742{
581 enc_t enc = { }; 743 enc_t enc = { 0 };
582 744
583 enc.cbor = *cbor; 745 enc.cbor = *cbor;
584 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 746 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
585 enc.cur = SvPVX (enc.sv); 747 enc.cur = SvPVX (enc.sv);
586 enc.end = SvEND (enc.sv); 748 enc.end = SvEND (enc.sv);
587 749
588 SvPOK_only (enc.sv); 750 SvPOK_only (enc.sv);
589 751
590 if (cbor->flags & F_PACK_STRINGS) 752 if (cbor->flags & F_PACK_STRINGS)
591 { 753 {
… …
618 U32 depth; // recursion depth 780 U32 depth; // recursion depth
619 U32 maxdepth; // recursion depth limit 781 U32 maxdepth; // recursion depth limit
620 AV *shareable; 782 AV *shareable;
621 AV *stringref; 783 AV *stringref;
622 SV *decode_tagged; 784 SV *decode_tagged;
785 SV *err_sv; // optional sv for error, needs to be freed
623} dec_t; 786} dec_t;
624 787
625#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 788// set dec->err to ERRSV
789ecb_cold static void
790err_errsv (dec_t *dec)
791{
792 if (!dec->err)
793 {
794 dec->err_sv = newSVsv (ERRSV);
626 795
627#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 796 // chop off the trailing \n
797 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
798 *SvEND (dec->err_sv) = 0;
628 799
800 dec->err = SvPVutf8_nolen (dec->err_sv);
801 }
802}
803
804// the following functions are used to reduce code size and help the compiler to optimise
805ecb_cold static void
806err_set (dec_t *dec, const char *reason)
807{
808 if (!dec->err)
809 dec->err = reason;
810}
811
812ecb_cold static void
813err_unexpected_end (dec_t *dec)
814{
815 err_set (dec, "unexpected end of CBOR data");
816}
817
818#define ERR_DO(do) SB do; goto fail; SE
819#define ERR(reason) ERR_DO (err_set (dec, reason))
820#define ERR_ERRSV ERR_DO (err_errsv (dec))
821
822#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
823
629#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 824#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 825#define DEC_DEC_DEPTH --dec->depth
631 826
632static UV 827static UV
633decode_uint (dec_t *dec) 828decode_uint (dec_t *dec)
634{ 829{
… …
700 895
701 for (;;) 896 for (;;)
702 { 897 {
703 WANT (1); 898 WANT (1);
704 899
705 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 900 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
706 { 901 {
707 ++dec->cur; 902 ++dec->cur;
708 break; 903 break;
709 } 904 }
710 905
711 av_push (av, decode_sv (dec)); 906 av_push (av, decode_sv (dec));
712 } 907 }
713 } 908 }
714 else 909 else
715 { 910 {
716 int i, len = decode_uint (dec); 911 UV i, len = decode_uint (dec);
717 912
718 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 913 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); 914 av_fill (av, len - 1);
720 915
721 for (i = 0; i < len; ++i) 916 for (i = 0; i < len; ++i)
… …
724 919
725 DEC_DEC_DEPTH; 920 DEC_DEC_DEPTH;
726 return newRV_noinc ((SV *)av); 921 return newRV_noinc ((SV *)av);
727 922
728fail: 923fail:
729 SvREFCNT_dec (av); 924 SvREFCNT_dec_NN (av);
730 DEC_DEC_DEPTH; 925 DEC_DEC_DEPTH;
731 return &PL_sv_undef; 926 return &PL_sv_undef;
732} 927}
733 928
734static void 929static void
… …
736{ 931{
737 // for speed reasons, we specialcase single-string 932 // for speed reasons, we specialcase single-string
738 // byte or utf-8 strings as keys, but only when !stringref 933 // byte or utf-8 strings as keys, but only when !stringref
739 934
740 if (ecb_expect_true (!dec->stringref)) 935 if (ecb_expect_true (!dec->stringref))
741 if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 936 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
742 { 937 {
743 I32 len = decode_uint (dec); 938 STRLEN len = decode_uint (dec);
744 char *key = (char *)dec->cur; 939 char *key = (char *)dec->cur;
745 940
941 WANT (len);
746 dec->cur += len; 942 dec->cur += len;
747 943
748 hv_store (hv, key, len, decode_sv (dec), 0); 944 hv_store (hv, key, len, decode_sv (dec), 0);
749 945
750 return; 946 return;
751 } 947 }
752 else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 948 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
753 { 949 {
754 I32 len = decode_uint (dec); 950 STRLEN len = decode_uint (dec);
755 char *key = (char *)dec->cur; 951 char *key = (char *)dec->cur;
756 952
953 WANT (len);
757 dec->cur += len; 954 dec->cur += len;
758 955
759 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 956 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
760 if (!is_utf8_string (key, len)) 957 if (!is_utf8_string (key, len))
761 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 958 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
… …
766 } 963 }
767 964
768 SV *k = decode_sv (dec); 965 SV *k = decode_sv (dec);
769 SV *v = decode_sv (dec); 966 SV *v = decode_sv (dec);
770 967
968 // we leak memory if uncaught exceptions are thrown by random magical
969 // methods, and this is hopefully the only place where it can happen,
970 // so if there is a chance of an exception, take the very slow path.
971 // since catching exceptions is "undocumented/internal/forbidden" by
972 // the new p5p powers, we need to call out to a perl function :/
973 if (ecb_expect_false (SvAMAGIC (k)))
974 {
975 dSP;
976
977 ENTER; SAVETMPS;
978 PUSHMARK (SP);
979 EXTEND (SP, 3);
980 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
981 PUSHs (sv_2mortal (k));
982 PUSHs (sv_2mortal (v));
983
984 PUTBACK;
985 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
986 SPAGAIN;
987
988 FREETMPS; LEAVE;
989
990 if (SvTRUE (ERRSV))
991 ERR_ERRSV;
992
993 return;
994 }
995
771 hv_store_ent (hv, k, v, 0); 996 hv_store_ent (hv, k, v, 0);
772 SvREFCNT_dec (k); 997 SvREFCNT_dec_NN (k);
773 998
774fail: 999fail:
775 ; 1000 ;
776} 1001}
777 1002
… …
788 1013
789 for (;;) 1014 for (;;)
790 { 1015 {
791 WANT (1); 1016 WANT (1);
792 1017
793 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1018 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
794 { 1019 {
795 ++dec->cur; 1020 ++dec->cur;
796 break; 1021 break;
797 } 1022 }
798 1023
799 decode_he (dec, hv); 1024 decode_he (dec, hv);
800 } 1025 }
801 } 1026 }
802 else 1027 else
803 { 1028 {
804 int pairs = decode_uint (dec); 1029 UV pairs = decode_uint (dec);
1030
1031 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
805 1032
806 while (pairs--) 1033 while (pairs--)
807 decode_he (dec, hv); 1034 decode_he (dec, hv);
808 } 1035 }
809 1036
810 DEC_DEC_DEPTH; 1037 DEC_DEC_DEPTH;
811 return newRV_noinc ((SV *)hv); 1038 return newRV_noinc ((SV *)hv);
812 1039
813fail: 1040fail:
814 SvREFCNT_dec (hv); 1041 SvREFCNT_dec_NN (hv);
815 DEC_DEC_DEPTH; 1042 DEC_DEC_DEPTH;
816 return &PL_sv_undef; 1043 return &PL_sv_undef;
817} 1044}
818 1045
819static SV * 1046static SV *
820decode_str (dec_t *dec, int utf8) 1047decode_str (dec_t *dec, int utf8)
821{ 1048{
822 SV *sv = 0; 1049 SV *sv = 0;
823 1050
824 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1051 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
825 { 1052 {
826 // indefinite length strings 1053 // indefinite length strings
827 ++dec->cur; 1054 ++dec->cur;
828 1055
829 U8 major = *dec->cur & MAJOR_MISC; 1056 U8 major = *dec->cur & MAJOR_MISC;
… …
897 sv = newRV_noinc (decode_sv (dec)); 1124 sv = newRV_noinc (decode_sv (dec));
898 break; 1125 break;
899 1126
900 case CBOR_TAG_STRINGREF_NAMESPACE: 1127 case CBOR_TAG_STRINGREF_NAMESPACE:
901 { 1128 {
1129 // do not use SAVETMPS/FREETMPS, as these will
1130 // erase mortalised caches, e.g. "shareable"
902 ENTER; SAVETMPS; 1131 ENTER;
903 1132
904 SAVESPTR (dec->stringref); 1133 SAVESPTR (dec->stringref);
905 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1134 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
906 1135
907 sv = decode_sv (dec); 1136 sv = decode_sv (dec);
908 1137
909 FREETMPS; LEAVE; 1138 LEAVE;
910 } 1139 }
911 break; 1140 break;
912 1141
913 case CBOR_TAG_STRINGREF: 1142 case CBOR_TAG_STRINGREF:
914 { 1143 {
915 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1144 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
916 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1145 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
917 1146
918 UV idx = decode_uint (dec); 1147 UV idx = decode_uint (dec);
919 1148
920 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1149 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
921 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1150 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
922 1151
923 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1152 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
924 } 1153 }
925 break; 1154 break;
… …
953 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1182 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
954 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1183 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
955 1184
956 UV idx = decode_uint (dec); 1185 UV idx = decode_uint (dec);
957 1186
958 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1187 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
959 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1188 ERR ("corrupted CBOR data (sharedref index out of bounds)");
960 1189
961 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1190 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
962 1191
963 if (sv == &PL_sv_undef) 1192 if (sv == &PL_sv_undef)
… …
965 } 1194 }
966 break; 1195 break;
967 1196
968 case CBOR_TAG_PERL_OBJECT: 1197 case CBOR_TAG_PERL_OBJECT:
969 { 1198 {
1199 if (dec->cbor.flags & F_FORBID_OBJECTS)
1200 goto filter;
1201
970 sv = decode_sv (dec); 1202 sv = decode_sv (dec);
971 1203
972 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1204 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
973 ERR ("corrupted CBOR data (non-array perl object)"); 1205 ERR ("corrupted CBOR data (non-array perl object)");
974 1206
… …
984 if (!method) 1216 if (!method)
985 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1217 ERR ("cannot decode perl-object (package does not have a THAW method)");
986 1218
987 dSP; 1219 dSP;
988 1220
989 ENTER; SAVETMPS; PUSHMARK (SP); 1221 ENTER; SAVETMPS;
1222 PUSHMARK (SP);
990 EXTEND (SP, len + 1); 1223 EXTEND (SP, len + 1);
991 // we re-bless the reference to get overload and other niceties right 1224 // we re-bless the reference to get overload and other niceties right
992 PUSHs (*av_fetch (av, 0, 1)); 1225 PUSHs (*av_fetch (av, 0, 1));
993 PUSHs (sv_cbor); 1226 PUSHs (sv_cbor);
994 1227
… …
1002 SPAGAIN; 1235 SPAGAIN;
1003 1236
1004 if (SvTRUE (ERRSV)) 1237 if (SvTRUE (ERRSV))
1005 { 1238 {
1006 FREETMPS; LEAVE; 1239 FREETMPS; LEAVE;
1007 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1240 ERR_ERRSV;
1008 } 1241 }
1009 1242
1010 SvREFCNT_dec (sv); 1243 SvREFCNT_dec_NN (sv);
1011 sv = SvREFCNT_inc (POPs); 1244 sv = SvREFCNT_inc (POPs);
1012 1245
1013 PUTBACK; 1246 PUTBACK;
1014 1247
1015 FREETMPS; LEAVE; 1248 FREETMPS; LEAVE;
1016 } 1249 }
1017 break; 1250 break;
1018 1251
1019 default: 1252 default:
1253 filter:
1020 { 1254 {
1255 SV *tag_sv = newSVuv (tag);
1256
1021 sv = decode_sv (dec); 1257 sv = decode_sv (dec);
1022 1258
1023 dSP; 1259 dSP;
1024 ENTER; SAVETMPS; PUSHMARK (SP); 1260 ENTER; SAVETMPS;
1261 PUSHMARK (SP);
1025 EXTEND (SP, 2); 1262 EXTEND (SP, 2);
1026 PUSHs (newSVuv (tag)); 1263 PUSHs (tag_sv);
1027 PUSHs (sv); 1264 PUSHs (sv);
1028 1265
1029 PUTBACK; 1266 PUTBACK;
1030 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1267 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1031 SPAGAIN; 1268 SPAGAIN;
1032 1269
1033 if (SvTRUE (ERRSV)) 1270 if (SvTRUE (ERRSV))
1034 { 1271 {
1272 SvREFCNT_dec_NN (tag_sv);
1035 FREETMPS; LEAVE; 1273 FREETMPS; LEAVE;
1036 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1274 ERR_ERRSV;
1037 } 1275 }
1038 1276
1039 if (count) 1277 if (count)
1040 { 1278 {
1279 SvREFCNT_dec_NN (tag_sv);
1041 SvREFCNT_dec (sv); 1280 SvREFCNT_dec_NN (sv);
1042 sv = SvREFCNT_inc (POPs); 1281 sv = SvREFCNT_inc_NN (TOPs);
1282 SP -= count;
1043 } 1283 }
1044 else 1284 else
1045 { 1285 {
1046 AV *av = newAV (); 1286 AV *av = newAV ();
1047 av_push (av, newSVuv (tag)); 1287 av_push (av, tag_sv);
1048 av_push (av, sv); 1288 av_push (av, sv);
1049 1289
1050 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1290 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1051 ? cbor_tagged_stash 1291 ? cbor_tagged_stash
1052 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1292 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1155} 1395}
1156 1396
1157static SV * 1397static SV *
1158decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1398decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1159{ 1399{
1160 dec_t dec = { }; 1400 dec_t dec = { 0 };
1161 SV *sv; 1401 SV *sv;
1162 STRLEN len; 1402 STRLEN len;
1163 char *data = SvPVbyte (string, len); 1403 char *data = SvPVbyte (string, len);
1164 1404
1165 if (len > cbor->max_size && cbor->max_size) 1405 if (len > cbor->max_size && cbor->max_size)
… …
1181 1421
1182 if (dec.err) 1422 if (dec.err)
1183 { 1423 {
1184 if (dec.shareable) 1424 if (dec.shareable)
1185 { 1425 {
1186 // need to break cyclic links, which whould all be in shareable 1426 // need to break cyclic links, which would all be in shareable
1187 int i; 1427 int i;
1188 SV **svp; 1428 SV **svp;
1189 1429
1190 for (i = av_len (dec.shareable) + 1; i--; ) 1430 for (i = av_len (dec.shareable) + 1; i--; )
1191 if ((svp = av_fetch (dec.shareable, i, 0))) 1431 if ((svp = av_fetch (dec.shareable, i, 0)))
1192 sv_setsv (*svp, &PL_sv_undef); 1432 sv_setsv (*svp, &PL_sv_undef);
1193 } 1433 }
1194 1434
1195 SvREFCNT_dec (sv); 1435 SvREFCNT_dec_NN (sv);
1436
1437 if (dec.err_sv)
1438 sv_2mortal (dec.err_sv);
1439
1196 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1440 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1197 } 1441 }
1198 1442
1199 sv = sv_2mortal (sv); 1443 sv = sv_2mortal (sv);
1200 1444
… …
1256 1500
1257 int major = *p >> MAJOR_SHIFT; 1501 int major = *p >> MAJOR_SHIFT;
1258 1502
1259 switch (major) 1503 switch (major)
1260 { 1504 {
1505 case MAJOR_TAG >> MAJOR_SHIFT:
1506 ++count; // tags merely prefix another value
1507 break;
1508
1261 case MAJOR_BYTES >> MAJOR_SHIFT: 1509 case MAJOR_BYTES >> MAJOR_SHIFT:
1262 case MAJOR_TEXT >> MAJOR_SHIFT: 1510 case MAJOR_TEXT >> MAJOR_SHIFT:
1263 case MAJOR_ARRAY >> MAJOR_SHIFT: 1511 case MAJOR_ARRAY >> MAJOR_SHIFT:
1264 case MAJOR_MAP >> MAJOR_SHIFT: 1512 case MAJOR_MAP >> MAJOR_SHIFT:
1265 { 1513 {
… …
1340 1588
1341 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1589 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1342 1590
1343 sv_cbor = newSVpv ("CBOR", 0); 1591 sv_cbor = newSVpv ("CBOR", 0);
1344 SvREADONLY_on (sv_cbor); 1592 SvREADONLY_on (sv_cbor);
1593
1594 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1345} 1595}
1346 1596
1347PROTOTYPES: DISABLE 1597PROTOTYPES: DISABLE
1348 1598
1349void CLONE (...) 1599void CLONE (...)
… …
1369 ALIAS: 1619 ALIAS:
1370 shrink = F_SHRINK 1620 shrink = F_SHRINK
1371 allow_unknown = F_ALLOW_UNKNOWN 1621 allow_unknown = F_ALLOW_UNKNOWN
1372 allow_sharing = F_ALLOW_SHARING 1622 allow_sharing = F_ALLOW_SHARING
1373 allow_cycles = F_ALLOW_CYCLES 1623 allow_cycles = F_ALLOW_CYCLES
1624 forbid_objects = F_FORBID_OBJECTS
1374 pack_strings = F_PACK_STRINGS 1625 pack_strings = F_PACK_STRINGS
1626 text_keys = F_TEXT_KEYS
1627 text_strings = F_TEXT_STRINGS
1375 validate_utf8 = F_VALIDATE_UTF8 1628 validate_utf8 = F_VALIDATE_UTF8
1376 PPCODE: 1629 PPCODE:
1377{ 1630{
1378 if (enable) 1631 if (enable)
1379 self->flags |= ix; 1632 self->flags |= ix;
… …
1387 ALIAS: 1640 ALIAS:
1388 get_shrink = F_SHRINK 1641 get_shrink = F_SHRINK
1389 get_allow_unknown = F_ALLOW_UNKNOWN 1642 get_allow_unknown = F_ALLOW_UNKNOWN
1390 get_allow_sharing = F_ALLOW_SHARING 1643 get_allow_sharing = F_ALLOW_SHARING
1391 get_allow_cycles = F_ALLOW_CYCLES 1644 get_allow_cycles = F_ALLOW_CYCLES
1645 get_forbid_objects = F_FORBID_OBJECTS
1392 get_pack_strings = F_PACK_STRINGS 1646 get_pack_strings = F_PACK_STRINGS
1647 get_text_keys = F_TEXT_KEYS
1648 get_text_strings = F_TEXT_STRINGS
1393 get_validate_utf8 = F_VALIDATE_UTF8 1649 get_validate_utf8 = F_VALIDATE_UTF8
1394 PPCODE: 1650 PPCODE:
1395 XPUSHs (boolSV (self->flags & ix)); 1651 XPUSHs (boolSV (self->flags & ix));
1396 1652
1397void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1653void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
… …
1448 PUSHs (sv); 1704 PUSHs (sv);
1449 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1705 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1450} 1706}
1451 1707
1452void incr_parse (CBOR *self, SV *cborstr) 1708void incr_parse (CBOR *self, SV *cborstr)
1709 ALIAS:
1710 incr_parse_multiple = 1
1453 PPCODE: 1711 PPCODE:
1454{ 1712{
1455 if (SvUTF8 (cborstr)) 1713 if (SvUTF8 (cborstr))
1456 sv_utf8_downgrade (cborstr, 0); 1714 sv_utf8_downgrade (cborstr, 0);
1457 1715
… …
1487 av_push (self->incr_count, newSViv (1)); 1745 av_push (self->incr_count, newSViv (1));
1488 1746
1489 self->incr_pos = 0; 1747 self->incr_pos = 0;
1490 self->incr_need = self->incr_pos + 1; 1748 self->incr_need = self->incr_pos + 1;
1491 } 1749 }
1492 while (GIMME_V == G_ARRAY); 1750 while (ix);
1493} 1751}
1494 1752
1495void incr_reset (CBOR *self) 1753void incr_reset (CBOR *self)
1496 CODE: 1754 CODE:
1497{ 1755{
… …
1525 cbor_init (&cbor); 1783 cbor_init (&cbor);
1526 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1784 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1527 XPUSHs (cborstr); 1785 XPUSHs (cborstr);
1528} 1786}
1529 1787
1788#ifdef __AFL_COMPILER
1789
1790void
1791afl_init ()
1792 CODE:
1793 __AFL_INIT ();
1794
1795int
1796afl_loop (unsigned int count = 10000)
1797 CODE:
1798 RETVAL = __AFL_LOOP (count);
1799 OUTPUT:
1800 RETVAL
1801
1802#endif
1803

Diff Legend

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