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

Diff Legend

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