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.51 by root, Sun Apr 24 13:15:19 2016 UTC vs.
Revision 1.72 by root, Thu Oct 21 01:14:58 2021 UTC

… …
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
12#define ECB_NO_THREADS 1 13#define ECB_NO_THREADS 1
13#include "ecb.h" 14#include "ecb.h"
14 15
15// compatibility with perl <5.18 16// compatibility with perl <5.18
… …
20# define HvNAMELEN(hv) HvNAMELEN_get (hv) 21# define HvNAMELEN(hv) HvNAMELEN_get (hv)
21#endif 22#endif
22#ifndef HvNAMEUTF8 23#ifndef HvNAMEUTF8
23# define HvNAMEUTF8(hv) 0 24# define HvNAMEUTF8(hv) 0
24#endif 25#endif
26#ifndef SvREFCNT_inc_NN
27# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
28#endif
25#ifndef SvREFCNT_dec_NN 29#ifndef SvREFCNT_dec_NN
26# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv) 30# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
27#endif 31#endif
32
33// perl's is_utf8_string interprets len=0 as "calculate len", but we want it to mean 0
34#define cbor_is_utf8_string(str,len) (!(len) || is_utf8_string ((str), (len)))
28 35
29// known major and minor types 36// known major and minor types
30enum cbor_type 37enum cbor_type
31{ 38{
32 MAJOR_SHIFT = 5, 39 MAJOR_SHIFT = 5,
… …
95 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 102 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
96 103
97 CBOR_TAG_MAGIC = 55799, // self-describe cbor 104 CBOR_TAG_MAGIC = 55799, // self-describe cbor
98}; 105};
99 106
107// known forced types, also hardcoded in CBOR.pm
108enum
109{
110 AS_CBOR = 0,
111 AS_INT = 1,
112 AS_BYTES = 2,
113 AS_TEXT = 3,
114 AS_FLOAT16 = 4,
115 AS_FLOAT32 = 5,
116 AS_FLOAT64 = 6,
117 AS_MAP = 7,
118 // possibly future enhancements: (generic) float, (generic) string
119};
120
100#define F_SHRINK 0x00000001UL 121#define F_SHRINK 0x00000001UL
101#define F_ALLOW_UNKNOWN 0x00000002UL 122#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL 123#define F_ALLOW_SHARING 0x00000004UL
103#define F_ALLOW_CYCLES 0x00000008UL 124#define F_ALLOW_CYCLES 0x00000008UL
125#define F_FORBID_OBJECTS 0x00000010UL
104#define F_PACK_STRINGS 0x00000010UL 126#define F_PACK_STRINGS 0x00000020UL
127#define F_TEXT_KEYS 0x00000040UL
105#define F_UTF8_STRINGS 0x00000020UL 128#define F_TEXT_STRINGS 0x00000080UL
106#define F_VALIDATE_UTF8 0x00000040UL 129#define F_VALIDATE_UTF8 0x00000100UL
107 130
108#define INIT_SIZE 32 // initial scalar size to be allocated 131#define INIT_SIZE 32 // initial scalar size to be allocated
109 132
110#define SB do { 133#define SB do {
111#define SE } while (0) 134#define SE } while (0)
… …
181#endif 204#endif
182 } 205 }
183} 206}
184 207
185// minimum length of a string to be registered for stringref 208// minimum length of a string to be registered for stringref
186ecb_inline int 209ecb_inline STRLEN
187minimum_string_length (UV idx) 210minimum_string_length (UV idx)
188{ 211{
189 return idx > 23 212 return idx <= 23 ? 3
190 ? idx > 0xffU 213 : idx <= 0xffU ? 4
191 ? idx > 0xffffU 214 : idx <= 0xffffU ? 5
192 ? idx > 0xffffffffU 215 : idx <= 0xffffffffU ? 7
193 ? 11 216 : 11;
194 : 7
195 : 5
196 : 4
197 : 3;
198} 217}
199 218
200///////////////////////////////////////////////////////////////////////////// 219/////////////////////////////////////////////////////////////////////////////
201// encoder 220// encoder
202 221
… …
215} enc_t; 234} enc_t;
216 235
217ecb_inline void 236ecb_inline void
218need (enc_t *enc, STRLEN len) 237need (enc_t *enc, STRLEN len)
219{ 238{
220 if (ecb_expect_false (enc->cur + len >= enc->end)) 239 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
221 { 240 {
222 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 241 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
223 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 242 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
224 enc->cur = SvPVX (enc->sv) + cur; 243 enc->cur = SvPVX (enc->sv) + cur;
225 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 244 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
226 } 245 }
227} 246}
228 247
248static void encode_sv (enc_t *enc, SV *sv);
249
229ecb_inline void 250ecb_inline void
230encode_ch (enc_t *enc, char ch) 251encode_ch (enc_t *enc, char ch)
231{ 252{
232 need (enc, 1); 253 need (enc, 1);
233 *enc->cur++ = ch; 254 *enc->cur++ = ch;
234} 255}
235 256
257// used for tags, intregers, element counts and so on
236static void 258static void
237encode_uint (enc_t *enc, int major, UV len) 259encode_uint (enc_t *enc, int major, UV len)
238{ 260{
239 need (enc, 9); 261 need (enc, 9);
240 262
… …
271 *enc->cur++ = len >> 8; 293 *enc->cur++ = len >> 8;
272 *enc->cur++ = len; 294 *enc->cur++ = len;
273 } 295 }
274} 296}
275 297
298// encodes a perl value into a CBOR integer
299ecb_inline void
300encode_int (enc_t *enc, SV *sv)
301{
302 if (SvIsUV (sv))
303 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
304 else if (SvIVX (sv) >= 0)
305 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
306 else
307 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
308}
309
276ecb_inline void 310ecb_inline void
277encode_tag (enc_t *enc, UV tag) 311encode_tag (enc_t *enc, UV tag)
278{ 312{
279 encode_uint (enc, MAJOR_TAG, tag); 313 encode_uint (enc, MAJOR_TAG, tag);
280} 314}
281 315
316// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
317ecb_noinline static void
318encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
319{
320 STRLEN ulen = len;
321 U8 *p, *pend = (U8 *)str + len;
322
323 for (p = (U8 *)str; p < pend; ++p)
324 ulen += *p >> 7; // count set high bits
325
326 encode_uint (enc, MAJOR_TEXT, ulen);
327
328 need (enc, ulen);
329 for (p = (U8 *)str; p < pend; ++p)
330 if (*p < 0x80)
331 *enc->cur++ = *p;
332 else
333 {
334 *enc->cur++ = 0xc0 + (*p >> 6);
335 *enc->cur++ = 0x80 + (*p & 63);
336 }
337}
338
282ecb_inline void 339ecb_inline void
283encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 340encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
284{ 341{
285 if (ecb_expect_false (enc->cbor.flags & F_UTF8_STRINGS)) 342 if (ecb_expect_false (upgrade_utf8))
286 if (!utf8) 343 if (!utf8)
287 { 344 {
288 SV *sv = sv_newmortal ();
289 char *s; STRLEN l;
290
291 sv_setpvn (sv, str, len);
292
293 s = SvPVutf8 (sv, l);
294 encode_str (enc, 1, s, l); 345 encode_str_utf8 (enc, utf8, str, len);
295 return; 346 return;
296 } 347 }
297 348
298 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 349 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
299 need (enc, len); 350 need (enc, len);
300 memcpy (enc->cur, str, len); 351 memcpy (enc->cur, str, len);
301 enc->cur += len; 352 enc->cur += len;
302} 353}
303 354
304static void 355ecb_inline void
305encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 356encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
306{ 357{
307 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 358 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
308 { 359 {
309 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 360 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
310 361
… …
321 sv_setuv (*svp, enc->stringref_idx); 372 sv_setuv (*svp, enc->stringref_idx);
322 ++enc->stringref_idx; 373 ++enc->stringref_idx;
323 } 374 }
324 } 375 }
325 376
326 encode_str (enc, utf8, str, len); 377 encode_str (enc, upgrade_utf8, utf8, str, len);
327} 378}
328 379
329static void encode_sv (enc_t *enc, SV *sv); 380ecb_inline void
381encode_float16 (enc_t *enc, NV nv)
382{
383 need (enc, 1+2);
384
385 *enc->cur++ = MAJOR_MISC | MISC_FLOAT16;
386
387 uint16_t fp = ecb_float_to_binary16 (nv);
388
389 if (!ecb_big_endian ())
390 fp = ecb_bswap16 (fp);
391
392 memcpy (enc->cur, &fp, 2);
393 enc->cur += 2;
394}
395
396ecb_inline void
397encode_float32 (enc_t *enc, NV nv)
398{
399 need (enc, 1+4);
400
401 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
402
403 uint32_t fp = ecb_float_to_binary32 (nv);
404
405 if (!ecb_big_endian ())
406 fp = ecb_bswap32 (fp);
407
408 memcpy (enc->cur, &fp, 4);
409 enc->cur += 4;
410}
411
412ecb_inline void
413encode_float64 (enc_t *enc, NV nv)
414{
415 need (enc, 1+8);
416
417 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
418
419 uint64_t fp = ecb_double_to_binary64 (nv);
420
421 if (!ecb_big_endian ())
422 fp = ecb_bswap64 (fp);
423
424 memcpy (enc->cur, &fp, 8);
425 enc->cur += 8;
426}
427
428ecb_inline void
429encode_bool (enc_t *enc, int istrue)
430{
431 encode_ch (enc, istrue ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
432}
433
434// encodes an arrayref containing key-value pairs as CBOR map
435ecb_inline void
436encode_array_as_map (enc_t *enc, SV *sv)
437{
438 if (enc->depth >= enc->cbor.max_depth)
439 croak (ERR_NESTING_EXCEEDED);
440
441 ++enc->depth;
442
443 // as_map does error checking for us, but we re-check in case
444 // things have changed.
445
446 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
447 croak ("CBOR::XS::as_map requires an array reference (did you change the array after calling as_map?)");
448
449 AV *av = (AV *)SvRV (sv);
450 int i, len = av_len (av);
451
452 if (!(len & 1))
453 croak ("CBOR::XS::as_map requires an even number of elements (did you change the array after calling as_map?)");
454
455 encode_uint (enc, MAJOR_MAP, (len + 1) >> 1);
456
457 for (i = 0; i <= len; ++i)
458 {
459 SV **svp = av_fetch (av, i, 0);
460 encode_sv (enc, svp ? *svp : &PL_sv_undef);
461 }
462
463 --enc->depth;
464}
465
466ecb_inline void
467encode_forced (enc_t *enc, UV type, SV *sv)
468{
469 switch (type)
470 {
471 case AS_CBOR:
472 {
473 STRLEN len;
474 char *str = SvPVbyte (sv, len);
475
476 need (enc, len);
477 memcpy (enc->cur, str, len);
478 enc->cur += len;
479 }
480 break;
481
482 case AS_BYTES:
483 {
484 STRLEN len;
485 char *str = SvPVbyte (sv, len);
486 encode_strref (enc, 0, 0, str, len);
487 }
488 break;
489
490 case AS_TEXT:
491 {
492 STRLEN len;
493 char *str = SvPVutf8 (sv, len);
494 encode_strref (enc, 1, 1, str, len);
495 }
496 break;
497
498 case AS_INT: encode_int (enc, sv); break;
499
500 case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break;
501 case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break;
502 case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break;
503
504 case AS_MAP: encode_array_as_map (enc, sv); break;
505
506 default:
507 croak ("encountered malformed CBOR::XS::Tagged object");
508 }
509}
330 510
331static void 511static void
332encode_av (enc_t *enc, AV *av) 512encode_av (enc_t *enc, AV *av)
333{ 513{
334 int i, len = av_len (av); 514 int i, len = av_len (av);
… …
338 518
339 ++enc->depth; 519 ++enc->depth;
340 520
341 encode_uint (enc, MAJOR_ARRAY, len + 1); 521 encode_uint (enc, MAJOR_ARRAY, len + 1);
342 522
343 if (SvMAGICAL (av)) 523 if (ecb_expect_false (SvMAGICAL (av)))
344 for (i = 0; i <= len; ++i) 524 for (i = 0; i <= len; ++i)
345 { 525 {
346 SV **svp = av_fetch (av, i, 0); 526 SV **svp = av_fetch (av, i, 0);
347 encode_sv (enc, svp ? *svp : &PL_sv_undef); 527 encode_sv (enc, svp ? *svp : &PL_sv_undef);
348 } 528 }
… …
367 ++enc->depth; 547 ++enc->depth;
368 548
369 int pairs = hv_iterinit (hv); 549 int pairs = hv_iterinit (hv);
370 int mg = SvMAGICAL (hv); 550 int mg = SvMAGICAL (hv);
371 551
372 if (mg) 552 if (ecb_expect_false (mg))
373 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 553 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
374 else 554 else
375 encode_uint (enc, MAJOR_MAP, pairs); 555 encode_uint (enc, MAJOR_MAP, pairs);
376 556
377 while ((he = hv_iternext (hv))) 557 while ((he = hv_iternext (hv)))
378 { 558 {
379 if (HeKLEN (he) == HEf_SVKEY) 559 if (HeKLEN (he) == HEf_SVKEY)
380 encode_sv (enc, HeSVKEY (he)); 560 encode_sv (enc, HeSVKEY (he));
381 else 561 else
382 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 562 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
383 563
384 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 564 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
385 } 565 }
386 566
387 if (mg) 567 if (ecb_expect_false (mg))
388 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 568 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
389 569
390 --enc->depth; 570 --enc->depth;
391} 571}
392 572
… …
412 592
413 HV *stash = SvSTASH (sv); 593 HV *stash = SvSTASH (sv);
414 594
415 if (stash == boolean_stash) 595 if (stash == boolean_stash)
416 { 596 {
417 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE); 597 encode_bool (enc, SvIV (sv));
418 return; 598 return;
419 } 599 }
420 else if (stash == error_stash) 600 else if (stash == error_stash)
421 { 601 {
422 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF); 602 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
… …
425 else if (stash == tagged_stash) 605 else if (stash == tagged_stash)
426 { 606 {
427 if (svt != SVt_PVAV) 607 if (svt != SVt_PVAV)
428 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 608 croak ("encountered CBOR::XS::Tagged object that isn't an array");
429 609
610 switch (av_len ((AV *)sv))
611 {
612 case 2-1:
613 // actually a tagged value
430 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); 614 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
431 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 615 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
616 break;
617
618 case 3-1:
619 // a forced type [value, type, undef]
620 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
621 break;
622
623 default:
624 croak ("encountered malformed CBOR::XS::Tagged object");
625 }
432 626
433 return; 627 return;
434 } 628 }
435 } 629 }
436 630
437 if (ecb_expect_false (SvREFCNT (sv) > 1) 631 if (ecb_expect_false (SvREFCNT (sv) > 1)
438 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 632 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
439 { 633 {
440 if (!enc->shareable) 634 if (ecb_expect_false (!enc->shareable))
441 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 635 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
442 636
443 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 637 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
444 638
445 if (SvOK (*svp)) 639 if (SvOK (*svp))
… …
459 if (ecb_expect_false (SvOBJECT (sv))) 653 if (ecb_expect_false (SvOBJECT (sv)))
460 { 654 {
461 HV *stash = SvSTASH (sv); 655 HV *stash = SvSTASH (sv);
462 GV *method; 656 GV *method;
463 657
658 if (enc->cbor.flags & F_FORBID_OBJECTS)
659 croak ("encountered object '%s', but forbid_objects is enabled",
660 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
464 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 661 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
465 { 662 {
466 dSP; 663 dSP;
467 664
468 ENTER; SAVETMPS; 665 ENTER; SAVETMPS;
469 PUSHMARK (SP); 666 PUSHMARK (SP);
… …
488 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 685 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
489 { 686 {
490 dSP; 687 dSP;
491 688
492 ENTER; SAVETMPS; 689 ENTER; SAVETMPS;
493 SAVESTACK_POS ();
494 PUSHMARK (SP); 690 PUSHMARK (SP);
495 EXTEND (SP, 2); 691 EXTEND (SP, 2);
496 // we re-bless the reference to get overload and other niceties right 692 // we re-bless the reference to get overload and other niceties right
497 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 693 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
498 PUSHs (sv_cbor); 694 PUSHs (sv_cbor);
… …
505 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 701 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
506 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 702 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
507 703
508 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 704 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
509 encode_uint (enc, MAJOR_ARRAY, count + 1); 705 encode_uint (enc, MAJOR_ARRAY, count + 1);
510 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 706 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
511 707
512 while (count) 708 {
709 int i;
710
711 for (i = 0; i < count; ++i)
513 encode_sv (enc, SP[1 - count--]); 712 encode_sv (enc, SP[i + 1 - count]);
713
714 SP -= count;
715 }
514 716
515 PUTBACK; 717 PUTBACK;
516 718
517 FREETMPS; LEAVE; 719 FREETMPS; LEAVE;
518 } 720 }
… …
540 742
541 if (ecb_expect_false (nv == (NV)(U32)nv)) 743 if (ecb_expect_false (nv == (NV)(U32)nv))
542 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 744 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
543 //TODO: maybe I32? 745 //TODO: maybe I32?
544 else if (ecb_expect_false (nv == (float)nv)) 746 else if (ecb_expect_false (nv == (float)nv))
545 { 747 encode_float32 (enc, nv);
546 uint32_t fp = ecb_float_to_binary32 (nv);
547
548 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
549
550 if (!ecb_big_endian ())
551 fp = ecb_bswap32 (fp);
552
553 memcpy (enc->cur, &fp, 4);
554 enc->cur += 4;
555 }
556 else 748 else
557 { 749 encode_float64 (enc, nv);
558 uint64_t fp = ecb_double_to_binary64 (nv);
559
560 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
561
562 if (!ecb_big_endian ())
563 fp = ecb_bswap64 (fp);
564
565 memcpy (enc->cur, &fp, 8);
566 enc->cur += 8;
567 }
568} 750}
569 751
570static void 752static void
571encode_sv (enc_t *enc, SV *sv) 753encode_sv (enc_t *enc, SV *sv)
572{ 754{
… …
574 756
575 if (SvPOKp (sv)) 757 if (SvPOKp (sv))
576 { 758 {
577 STRLEN len; 759 STRLEN len;
578 char *str = SvPV (sv, len); 760 char *str = SvPV (sv, len);
579 encode_strref (enc, SvUTF8 (sv), str, len); 761 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
580 } 762 }
581 else if (SvNOKp (sv)) 763 else if (SvNOKp (sv))
582 encode_nv (enc, sv); 764 encode_nv (enc, sv);
583 else if (SvIOKp (sv)) 765 else if (SvIOKp (sv))
584 { 766 encode_int (enc, sv);
585 if (SvIsUV (sv))
586 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
587 else if (SvIVX (sv) >= 0)
588 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
589 else
590 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
591 }
592 else if (SvROK (sv)) 767 else if (SvROK (sv))
593 encode_rv (enc, SvRV (sv)); 768 encode_rv (enc, SvRV (sv));
594 else if (!SvOK (sv)) 769 else if (!SvOK (sv))
595 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 770 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
596 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 771 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
603static SV * 778static SV *
604encode_cbor (SV *scalar, CBOR *cbor) 779encode_cbor (SV *scalar, CBOR *cbor)
605{ 780{
606 enc_t enc = { 0 }; 781 enc_t enc = { 0 };
607 782
608 enc.cbor = *cbor; 783 enc.cbor = *cbor;
609 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 784 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
610 enc.cur = SvPVX (enc.sv); 785 enc.cur = SvPVX (enc.sv);
611 enc.end = SvEND (enc.sv); 786 enc.end = SvEND (enc.sv);
612 787
613 SvPOK_only (enc.sv); 788 SvPOK_only (enc.sv);
614 789
615 if (cbor->flags & F_PACK_STRINGS) 790 if (cbor->flags & F_PACK_STRINGS)
616 { 791 {
… …
643 U32 depth; // recursion depth 818 U32 depth; // recursion depth
644 U32 maxdepth; // recursion depth limit 819 U32 maxdepth; // recursion depth limit
645 AV *shareable; 820 AV *shareable;
646 AV *stringref; 821 AV *stringref;
647 SV *decode_tagged; 822 SV *decode_tagged;
823 SV *err_sv; // optional sv for error, needs to be freed
648} dec_t; 824} dec_t;
649 825
650#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 826// set dec->err to ERRSV
827ecb_cold static void
828err_errsv (dec_t *dec)
829{
830 if (!dec->err)
831 {
832 dec->err_sv = newSVsv (ERRSV);
651 833
652#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 834 // chop off the trailing \n
835 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
836 *SvEND (dec->err_sv) = 0;
653 837
838 dec->err = SvPVutf8_nolen (dec->err_sv);
839 }
840}
841
842// the following functions are used to reduce code size and help the compiler to optimise
843ecb_cold static void
844err_set (dec_t *dec, const char *reason)
845{
846 if (!dec->err)
847 dec->err = reason;
848}
849
850ecb_cold static void
851err_unexpected_end (dec_t *dec)
852{
853 err_set (dec, "unexpected end of CBOR data");
854}
855
856#define ERR_DO(do) SB do; goto fail; SE
857#define ERR(reason) ERR_DO (err_set (dec, reason))
858#define ERR_ERRSV ERR_DO (err_errsv (dec))
859
860#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
861
654#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 862#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
655#define DEC_DEC_DEPTH --dec->depth 863#define DEC_DEC_DEPTH --dec->depth
656 864
657static UV 865static UV
658decode_uint (dec_t *dec) 866decode_uint (dec_t *dec)
659{ 867{
… …
725 933
726 for (;;) 934 for (;;)
727 { 935 {
728 WANT (1); 936 WANT (1);
729 937
730 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 938 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
731 { 939 {
732 ++dec->cur; 940 ++dec->cur;
733 break; 941 break;
734 } 942 }
735 943
736 av_push (av, decode_sv (dec)); 944 av_push (av, decode_sv (dec));
737 } 945 }
738 } 946 }
739 else 947 else
740 { 948 {
741 int i, len = decode_uint (dec); 949 UV i, len = decode_uint (dec);
742 950
743 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 951 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
744 av_fill (av, len - 1); 952 av_fill (av, len - 1);
745 953
746 for (i = 0; i < len; ++i) 954 for (i = 0; i < len; ++i)
… …
749 957
750 DEC_DEC_DEPTH; 958 DEC_DEC_DEPTH;
751 return newRV_noinc ((SV *)av); 959 return newRV_noinc ((SV *)av);
752 960
753fail: 961fail:
754 SvREFCNT_dec (av); 962 SvREFCNT_dec_NN (av);
755 DEC_DEC_DEPTH; 963 DEC_DEC_DEPTH;
756 return &PL_sv_undef; 964 return &PL_sv_undef;
757} 965}
758 966
759static void 967static void
… …
763 // byte or utf-8 strings as keys, but only when !stringref 971 // byte or utf-8 strings as keys, but only when !stringref
764 972
765 if (ecb_expect_true (!dec->stringref)) 973 if (ecb_expect_true (!dec->stringref))
766 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 974 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
767 { 975 {
768 I32 len = decode_uint (dec); 976 STRLEN len = decode_uint (dec);
769 char *key = (char *)dec->cur; 977 char *key = (char *)dec->cur;
770 978
771 WANT (len); 979 WANT (len);
772 dec->cur += len; 980 dec->cur += len;
773 981
… …
775 983
776 return; 984 return;
777 } 985 }
778 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 986 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
779 { 987 {
780 I32 len = decode_uint (dec); 988 STRLEN len = decode_uint (dec);
781 char *key = (char *)dec->cur; 989 char *key = (char *)dec->cur;
990 printf ("len %d\n", len);//D
782 991
783 WANT (len); 992 WANT (len);
784 dec->cur += len; 993 dec->cur += len;
785 994
786 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 995 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
787 if (!is_utf8_string (key, len)) 996 if (!cbor_is_utf8_string ((U8 *)key, len))
788 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 997 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
789 998
790 hv_store (hv, key, -len, decode_sv (dec), 0); 999 hv_store (hv, key, -len, decode_sv (dec), 0);
791 1000
792 return; 1001 return;
793 } 1002 }
794 1003
795 SV *k = decode_sv (dec); 1004 SV *k = decode_sv (dec);
796 SV *v = decode_sv (dec); 1005 SV *v = decode_sv (dec);
797 1006
1007 // we leak memory if uncaught exceptions are thrown by random magical
1008 // methods, and this is hopefully the only place where it can happen,
1009 // so if there is a chance of an exception, take the very slow path.
1010 // since catching exceptions is "undocumented/internal/forbidden" by
1011 // the new p5p powers, we need to call out to a perl function :/
1012 if (ecb_expect_false (SvAMAGIC (k)))
1013 {
1014 dSP;
1015
1016 ENTER; SAVETMPS;
1017 PUSHMARK (SP);
1018 EXTEND (SP, 3);
1019 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
1020 PUSHs (sv_2mortal (k));
1021 PUSHs (sv_2mortal (v));
1022
1023 PUTBACK;
1024 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
1025 SPAGAIN;
1026
1027 FREETMPS; LEAVE;
1028
1029 if (SvTRUE (ERRSV))
1030 ERR_ERRSV;
1031
1032 return;
1033 }
1034
798 hv_store_ent (hv, k, v, 0); 1035 hv_store_ent (hv, k, v, 0);
799 SvREFCNT_dec (k); 1036 SvREFCNT_dec_NN (k);
800 1037
801fail: 1038fail:
802 ; 1039 ;
803} 1040}
804 1041
… …
815 1052
816 for (;;) 1053 for (;;)
817 { 1054 {
818 WANT (1); 1055 WANT (1);
819 1056
820 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1057 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
821 { 1058 {
822 ++dec->cur; 1059 ++dec->cur;
823 break; 1060 break;
824 } 1061 }
825 1062
826 decode_he (dec, hv); 1063 decode_he (dec, hv);
827 } 1064 }
828 } 1065 }
829 else 1066 else
830 { 1067 {
831 int pairs = decode_uint (dec); 1068 UV pairs = decode_uint (dec);
1069
1070 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
832 1071
833 while (pairs--) 1072 while (pairs--)
834 decode_he (dec, hv); 1073 decode_he (dec, hv);
835 } 1074 }
836 1075
837 DEC_DEC_DEPTH; 1076 DEC_DEC_DEPTH;
838 return newRV_noinc ((SV *)hv); 1077 return newRV_noinc ((SV *)hv);
839 1078
840fail: 1079fail:
841 SvREFCNT_dec (hv); 1080 SvREFCNT_dec_NN (hv);
842 DEC_DEC_DEPTH; 1081 DEC_DEC_DEPTH;
843 return &PL_sv_undef; 1082 return &PL_sv_undef;
844} 1083}
845 1084
846static SV * 1085static SV *
847decode_str (dec_t *dec, int utf8) 1086decode_str (dec_t *dec, int utf8)
848{ 1087{
849 SV *sv = 0; 1088 SV *sv = 0;
850 1089
851 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1090 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
852 { 1091 {
853 // indefinite length strings 1092 // indefinite length strings
854 ++dec->cur; 1093 ++dec->cur;
855 1094
856 U8 major = *dec->cur & MAJOR_MISC; 1095 U8 major = *dec->cur & MAJOR_MISC;
… …
891 } 1130 }
892 1131
893 if (utf8) 1132 if (utf8)
894 { 1133 {
895 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 1134 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
896 if (!is_utf8_string (SvPVX (sv), SvCUR (sv))) 1135 if (!cbor_is_utf8_string (SvPVX (sv), SvCUR (sv)))
897 ERR ("corrupted CBOR data (invalid UTF-8 in text string)"); 1136 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
898 1137
899 SvUTF8_on (sv); 1138 SvUTF8_on (sv);
900 } 1139 }
901 1140
… …
924 sv = newRV_noinc (decode_sv (dec)); 1163 sv = newRV_noinc (decode_sv (dec));
925 break; 1164 break;
926 1165
927 case CBOR_TAG_STRINGREF_NAMESPACE: 1166 case CBOR_TAG_STRINGREF_NAMESPACE:
928 { 1167 {
1168 // do not use SAVETMPS/FREETMPS, as these will
1169 // erase mortalised caches, e.g. "shareable"
929 ENTER; SAVETMPS; 1170 ENTER;
930 1171
931 SAVESPTR (dec->stringref); 1172 SAVESPTR (dec->stringref);
932 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1173 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
933 1174
934 sv = decode_sv (dec); 1175 sv = decode_sv (dec);
935 1176
936 FREETMPS; LEAVE; 1177 LEAVE;
937 } 1178 }
938 break; 1179 break;
939 1180
940 case CBOR_TAG_STRINGREF: 1181 case CBOR_TAG_STRINGREF:
941 { 1182 {
942 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1183 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
943 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1184 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
944 1185
945 UV idx = decode_uint (dec); 1186 UV idx = decode_uint (dec);
946 1187
947 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1188 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
948 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1189 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
949 1190
950 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1191 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
951 } 1192 }
952 break; 1193 break;
… …
980 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1221 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
981 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1222 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
982 1223
983 UV idx = decode_uint (dec); 1224 UV idx = decode_uint (dec);
984 1225
985 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1226 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
986 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1227 ERR ("corrupted CBOR data (sharedref index out of bounds)");
987 1228
988 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1229 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
989 1230
990 if (sv == &PL_sv_undef) 1231 if (sv == &PL_sv_undef)
… …
992 } 1233 }
993 break; 1234 break;
994 1235
995 case CBOR_TAG_PERL_OBJECT: 1236 case CBOR_TAG_PERL_OBJECT:
996 { 1237 {
1238 if (dec->cbor.flags & F_FORBID_OBJECTS)
1239 goto filter;
1240
997 sv = decode_sv (dec); 1241 sv = decode_sv (dec);
998 1242
999 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1243 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1000 ERR ("corrupted CBOR data (non-array perl object)"); 1244 ERR ("corrupted CBOR data (non-array perl object)");
1001 1245
… …
1030 SPAGAIN; 1274 SPAGAIN;
1031 1275
1032 if (SvTRUE (ERRSV)) 1276 if (SvTRUE (ERRSV))
1033 { 1277 {
1034 FREETMPS; LEAVE; 1278 FREETMPS; LEAVE;
1035 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1279 ERR_ERRSV;
1036 } 1280 }
1037 1281
1038 SvREFCNT_dec (sv); 1282 SvREFCNT_dec_NN (sv);
1039 sv = SvREFCNT_inc (POPs); 1283 sv = SvREFCNT_inc (POPs);
1040 1284
1041 PUTBACK; 1285 PUTBACK;
1042 1286
1043 FREETMPS; LEAVE; 1287 FREETMPS; LEAVE;
1044 } 1288 }
1045 break; 1289 break;
1046 1290
1047 default: 1291 default:
1292 filter:
1048 { 1293 {
1294 SV *tag_sv = newSVuv (tag);
1295
1049 sv = decode_sv (dec); 1296 sv = decode_sv (dec);
1050 1297
1051 dSP; 1298 dSP;
1052 ENTER; SAVETMPS; 1299 ENTER; SAVETMPS;
1053 SAVESTACK_POS ();
1054 PUSHMARK (SP); 1300 PUSHMARK (SP);
1055 EXTEND (SP, 2); 1301 EXTEND (SP, 2);
1056 PUSHs (newSVuv (tag)); 1302 PUSHs (tag_sv);
1057 PUSHs (sv); 1303 PUSHs (sv);
1058 1304
1059 PUTBACK; 1305 PUTBACK;
1060 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1306 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1061 SPAGAIN; 1307 SPAGAIN;
1062 1308
1063 if (SvTRUE (ERRSV)) 1309 if (SvTRUE (ERRSV))
1064 { 1310 {
1311 SvREFCNT_dec_NN (tag_sv);
1065 FREETMPS; LEAVE; 1312 FREETMPS; LEAVE;
1066 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1313 ERR_ERRSV;
1067 } 1314 }
1068 1315
1069 if (count) 1316 if (count)
1070 { 1317 {
1318 SvREFCNT_dec_NN (tag_sv);
1071 SvREFCNT_dec (sv); 1319 SvREFCNT_dec_NN (sv);
1072 sv = SvREFCNT_inc (POPs); 1320 sv = SvREFCNT_inc_NN (TOPs);
1321 SP -= count;
1073 } 1322 }
1074 else 1323 else
1075 { 1324 {
1076 AV *av = newAV (); 1325 AV *av = newAV ();
1077 av_push (av, newSVuv (tag)); 1326 av_push (av, tag_sv);
1078 av_push (av, sv); 1327 av_push (av, sv);
1079 1328
1080 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1329 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1081 ? cbor_tagged_stash 1330 ? cbor_tagged_stash
1082 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1331 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1211 1460
1212 if (dec.err) 1461 if (dec.err)
1213 { 1462 {
1214 if (dec.shareable) 1463 if (dec.shareable)
1215 { 1464 {
1216 // need to break cyclic links, which whould all be in shareable 1465 // need to break cyclic links, which would all be in shareable
1217 int i; 1466 int i;
1218 SV **svp; 1467 SV **svp;
1219 1468
1220 for (i = av_len (dec.shareable) + 1; i--; ) 1469 for (i = av_len (dec.shareable) + 1; i--; )
1221 if ((svp = av_fetch (dec.shareable, i, 0))) 1470 if ((svp = av_fetch (dec.shareable, i, 0)))
1222 sv_setsv (*svp, &PL_sv_undef); 1471 sv_setsv (*svp, &PL_sv_undef);
1223 } 1472 }
1224 1473
1225 SvREFCNT_dec (sv); 1474 SvREFCNT_dec_NN (sv);
1475
1476 if (dec.err_sv)
1477 sv_2mortal (dec.err_sv);
1478
1226 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1479 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1227 } 1480 }
1228 1481
1229 sv = sv_2mortal (sv); 1482 sv = sv_2mortal (sv);
1230 1483
… …
1320 1573
1321 break; 1574 break;
1322 1575
1323 case MAJOR_MAP >> MAJOR_SHIFT: 1576 case MAJOR_MAP >> MAJOR_SHIFT:
1324 len <<= 1; 1577 len <<= 1;
1578 /* FALLTHROUGH */
1325 case MAJOR_ARRAY >> MAJOR_SHIFT: 1579 case MAJOR_ARRAY >> MAJOR_SHIFT:
1326 if (len) 1580 if (len)
1327 { 1581 {
1328 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest 1582 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1329 count = len + 1; 1583 count = len + 1;
… …
1374 1628
1375 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1629 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1376 1630
1377 sv_cbor = newSVpv ("CBOR", 0); 1631 sv_cbor = newSVpv ("CBOR", 0);
1378 SvREADONLY_on (sv_cbor); 1632 SvREADONLY_on (sv_cbor);
1633
1634 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1379} 1635}
1380 1636
1381PROTOTYPES: DISABLE 1637PROTOTYPES: DISABLE
1382 1638
1383void CLONE (...) 1639void CLONE (...)
… …
1403 ALIAS: 1659 ALIAS:
1404 shrink = F_SHRINK 1660 shrink = F_SHRINK
1405 allow_unknown = F_ALLOW_UNKNOWN 1661 allow_unknown = F_ALLOW_UNKNOWN
1406 allow_sharing = F_ALLOW_SHARING 1662 allow_sharing = F_ALLOW_SHARING
1407 allow_cycles = F_ALLOW_CYCLES 1663 allow_cycles = F_ALLOW_CYCLES
1664 forbid_objects = F_FORBID_OBJECTS
1408 pack_strings = F_PACK_STRINGS 1665 pack_strings = F_PACK_STRINGS
1666 text_keys = F_TEXT_KEYS
1409 utf8_strings = F_UTF8_STRINGS 1667 text_strings = F_TEXT_STRINGS
1410 validate_utf8 = F_VALIDATE_UTF8 1668 validate_utf8 = F_VALIDATE_UTF8
1411 PPCODE: 1669 PPCODE:
1412{ 1670{
1413 if (enable) 1671 if (enable)
1414 self->flags |= ix; 1672 self->flags |= ix;
… …
1422 ALIAS: 1680 ALIAS:
1423 get_shrink = F_SHRINK 1681 get_shrink = F_SHRINK
1424 get_allow_unknown = F_ALLOW_UNKNOWN 1682 get_allow_unknown = F_ALLOW_UNKNOWN
1425 get_allow_sharing = F_ALLOW_SHARING 1683 get_allow_sharing = F_ALLOW_SHARING
1426 get_allow_cycles = F_ALLOW_CYCLES 1684 get_allow_cycles = F_ALLOW_CYCLES
1685 get_forbid_objects = F_FORBID_OBJECTS
1427 get_pack_strings = F_PACK_STRINGS 1686 get_pack_strings = F_PACK_STRINGS
1687 get_text_keys = F_TEXT_KEYS
1688 get_text_strings = F_TEXT_STRINGS
1428 get_validate_utf8 = F_VALIDATE_UTF8 1689 get_validate_utf8 = F_VALIDATE_UTF8
1429 PPCODE: 1690 PPCODE:
1430 XPUSHs (boolSV (self->flags & ix)); 1691 XPUSHs (boolSV (self->flags & ix));
1431 1692
1432void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1693void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
… …
1562 cbor_init (&cbor); 1823 cbor_init (&cbor);
1563 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1824 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1564 XPUSHs (cborstr); 1825 XPUSHs (cborstr);
1565} 1826}
1566 1827
1828#ifdef __AFL_COMPILER
1829
1830void
1831afl_init ()
1832 CODE:
1833 __AFL_INIT ();
1834
1835int
1836afl_loop (unsigned int count = 10000)
1837 CODE:
1838 RETVAL = __AFL_LOOP (count);
1839 OUTPUT:
1840 RETVAL
1841
1842#endif
1843

Diff Legend

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