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.75 by root, Thu Sep 7 23:52:24 2023 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
128#define F_TEXT_STRINGS 0x00000080UL
105#define F_VALIDATE_UTF8 0x00000020UL 129#define F_VALIDATE_UTF8 0x00000100UL
106 130
107#define INIT_SIZE 32 // initial scalar size to be allocated 131#define INIT_SIZE 32 // initial scalar size to be allocated
108 132
109#define SB do { 133#define SB do {
110#define SE } while (0) 134#define SE } while (0)
… …
180#endif 204#endif
181 } 205 }
182} 206}
183 207
184// minimum length of a string to be registered for stringref 208// minimum length of a string to be registered for stringref
185ecb_inline int 209ecb_inline STRLEN
186minimum_string_length (UV idx) 210minimum_string_length (UV idx)
187{ 211{
188 return idx > 23 212 return idx <= 23 ? 3
189 ? idx > 0xffU 213 : idx <= 0xffU ? 4
190 ? idx > 0xffffU 214 : idx <= 0xffffU ? 5
191 ? idx > 0xffffffffU 215 : idx <= 0xffffffffU ? 7
192 ? 11 216 : 11;
193 : 7
194 : 5
195 : 4
196 : 3;
197} 217}
198 218
199///////////////////////////////////////////////////////////////////////////// 219/////////////////////////////////////////////////////////////////////////////
200// encoder 220// encoder
201 221
… …
214} enc_t; 234} enc_t;
215 235
216ecb_inline void 236ecb_inline void
217need (enc_t *enc, STRLEN len) 237need (enc_t *enc, STRLEN len)
218{ 238{
219 if (ecb_expect_false (enc->cur + len >= enc->end)) 239 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
220 { 240 {
221 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 241 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
222 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 242 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
223 enc->cur = SvPVX (enc->sv) + cur; 243 enc->cur = SvPVX (enc->sv) + cur;
224 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 244 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
225 } 245 }
226} 246}
227 247
248static void encode_sv (enc_t *enc, SV *sv);
249
228ecb_inline void 250ecb_inline void
229encode_ch (enc_t *enc, char ch) 251encode_ch (enc_t *enc, char ch)
230{ 252{
231 need (enc, 1); 253 need (enc, 1);
232 *enc->cur++ = ch; 254 *enc->cur++ = ch;
233} 255}
234 256
257// used for tags, intregers, element counts and so on
235static void 258static void
236encode_uint (enc_t *enc, int major, UV len) 259encode_uint (enc_t *enc, int major, UV len)
237{ 260{
238 need (enc, 9); 261 need (enc, 9);
239 262
… …
270 *enc->cur++ = len >> 8; 293 *enc->cur++ = len >> 8;
271 *enc->cur++ = len; 294 *enc->cur++ = len;
272 } 295 }
273} 296}
274 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
275ecb_inline void 310ecb_inline void
276encode_tag (enc_t *enc, UV tag) 311encode_tag (enc_t *enc, UV tag)
277{ 312{
278 encode_uint (enc, MAJOR_TAG, tag); 313 encode_uint (enc, MAJOR_TAG, tag);
279} 314}
280 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
281ecb_inline void 339ecb_inline void
282encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 340encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
283{ 341{
342 if (ecb_expect_false (upgrade_utf8))
343 if (!utf8)
344 {
345 encode_str_utf8 (enc, utf8, str, len);
346 return;
347 }
348
284 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 349 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
285 need (enc, len); 350 need (enc, len);
286 memcpy (enc->cur, str, len); 351 memcpy (enc->cur, str, len);
287 enc->cur += len; 352 enc->cur += len;
288} 353}
289 354
290static void 355ecb_inline void
291encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 356encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
292{ 357{
293 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 358 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
294 { 359 {
295 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 360 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
296 361
… …
307 sv_setuv (*svp, enc->stringref_idx); 372 sv_setuv (*svp, enc->stringref_idx);
308 ++enc->stringref_idx; 373 ++enc->stringref_idx;
309 } 374 }
310 } 375 }
311 376
312 encode_str (enc, utf8, str, len); 377 encode_str (enc, upgrade_utf8, utf8, str, len);
313} 378}
314 379
315static 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}
316 510
317static void 511static void
318encode_av (enc_t *enc, AV *av) 512encode_av (enc_t *enc, AV *av)
319{ 513{
320 int i, len = av_len (av); 514 int i, len = av_len (av);
… …
324 518
325 ++enc->depth; 519 ++enc->depth;
326 520
327 encode_uint (enc, MAJOR_ARRAY, len + 1); 521 encode_uint (enc, MAJOR_ARRAY, len + 1);
328 522
329 if (SvMAGICAL (av)) 523 if (ecb_expect_false (SvMAGICAL (av)))
330 for (i = 0; i <= len; ++i) 524 for (i = 0; i <= len; ++i)
331 { 525 {
332 SV **svp = av_fetch (av, i, 0); 526 SV **svp = av_fetch (av, i, 0);
333 encode_sv (enc, svp ? *svp : &PL_sv_undef); 527 encode_sv (enc, svp ? *svp : &PL_sv_undef);
334 } 528 }
335 else 529 else
336 for (i = 0; i <= len; ++i) 530 for (i = 0; i <= len; ++i)
337 encode_sv (enc, AvARRAY (av)[i]); 531 {
532 SV *sv = AvARRAY (av)[i];
533 encode_sv (enc, sv ? sv : &PL_sv_undef);
534 }
338 535
339 --enc->depth; 536 --enc->depth;
340} 537}
341 538
342static void 539static void
… …
350 ++enc->depth; 547 ++enc->depth;
351 548
352 int pairs = hv_iterinit (hv); 549 int pairs = hv_iterinit (hv);
353 int mg = SvMAGICAL (hv); 550 int mg = SvMAGICAL (hv);
354 551
355 if (mg) 552 if (ecb_expect_false (mg))
356 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 553 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
357 else 554 else
358 encode_uint (enc, MAJOR_MAP, pairs); 555 encode_uint (enc, MAJOR_MAP, pairs);
359 556
360 while ((he = hv_iternext (hv))) 557 while ((he = hv_iternext (hv)))
361 { 558 {
362 if (HeKLEN (he) == HEf_SVKEY) 559 if (HeKLEN (he) == HEf_SVKEY)
363 encode_sv (enc, HeSVKEY (he)); 560 encode_sv (enc, HeSVKEY (he));
364 else 561 else
365 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));
366 563
367 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));
368 } 565 }
369 566
370 if (mg) 567 if (ecb_expect_false (mg))
371 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 568 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
372 569
373 --enc->depth; 570 --enc->depth;
374} 571}
375 572
… …
395 592
396 HV *stash = SvSTASH (sv); 593 HV *stash = SvSTASH (sv);
397 594
398 if (stash == boolean_stash) 595 if (stash == boolean_stash)
399 { 596 {
400 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE); 597 encode_bool (enc, SvIV (sv));
401 return; 598 return;
402 } 599 }
403 else if (stash == error_stash) 600 else if (stash == error_stash)
404 { 601 {
405 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF); 602 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
… …
408 else if (stash == tagged_stash) 605 else if (stash == tagged_stash)
409 { 606 {
410 if (svt != SVt_PVAV) 607 if (svt != SVt_PVAV)
411 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 608 croak ("encountered CBOR::XS::Tagged object that isn't an array");
412 609
610 switch (av_len ((AV *)sv))
611 {
612 case 2-1:
613 // actually a tagged value
413 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)));
414 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 }
415 626
416 return; 627 return;
417 } 628 }
418 } 629 }
419 630
420 if (ecb_expect_false (SvREFCNT (sv) > 1) 631 if (ecb_expect_false (SvREFCNT (sv) > 1)
421 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 632 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
422 { 633 {
423 if (!enc->shareable) 634 if (ecb_expect_false (!enc->shareable))
424 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 635 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
425 636
426 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 637 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
427 638
428 if (SvOK (*svp)) 639 if (SvOK (*svp))
… …
442 if (ecb_expect_false (SvOBJECT (sv))) 653 if (ecb_expect_false (SvOBJECT (sv)))
443 { 654 {
444 HV *stash = SvSTASH (sv); 655 HV *stash = SvSTASH (sv);
445 GV *method; 656 GV *method;
446 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))));
447 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 661 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
448 { 662 {
449 dSP; 663 dSP;
450 664
451 ENTER; SAVETMPS; PUSHMARK (SP); 665 ENTER; SAVETMPS;
666 PUSHMARK (SP);
452 // we re-bless the reference to get overload and other niceties right 667 // we re-bless the reference to get overload and other niceties right
453 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 668 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
454 669
455 PUTBACK; 670 PUTBACK;
456 // G_SCALAR ensures that return value is 1 671 // G_SCALAR ensures that return value is 1
… …
469 } 684 }
470 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 685 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
471 { 686 {
472 dSP; 687 dSP;
473 688
474 ENTER; SAVETMPS; PUSHMARK (SP); 689 ENTER; SAVETMPS;
690 PUSHMARK (SP);
475 EXTEND (SP, 2); 691 EXTEND (SP, 2);
476 // 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
477 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 693 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
478 PUSHs (sv_cbor); 694 PUSHs (sv_cbor);
479 695
… …
485 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 701 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)); 702 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
487 703
488 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 704 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
489 encode_uint (enc, MAJOR_ARRAY, count + 1); 705 encode_uint (enc, MAJOR_ARRAY, count + 1);
490 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 706 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
491 707
492 while (count) 708 {
709 int i;
710
711 for (i = 0; i < count; ++i)
493 encode_sv (enc, SP[1 - count--]); 712 encode_sv (enc, SP[i + 1 - count]);
713
714 SP -= count;
715 }
494 716
495 PUTBACK; 717 PUTBACK;
496 718
497 FREETMPS; LEAVE; 719 FREETMPS; LEAVE;
498 } 720 }
… …
520 742
521 if (ecb_expect_false (nv == (NV)(U32)nv)) 743 if (ecb_expect_false (nv == (NV)(U32)nv))
522 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 744 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
523 //TODO: maybe I32? 745 //TODO: maybe I32?
524 else if (ecb_expect_false (nv == (float)nv)) 746 else if (ecb_expect_false (nv == (float)nv))
525 { 747 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 748 else
537 { 749 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} 750}
549 751
550static void 752static void
551encode_sv (enc_t *enc, SV *sv) 753encode_sv (enc_t *enc, SV *sv)
552{ 754{
… …
554 756
555 if (SvPOKp (sv)) 757 if (SvPOKp (sv))
556 { 758 {
557 STRLEN len; 759 STRLEN len;
558 char *str = SvPV (sv, len); 760 char *str = SvPV (sv, len);
559 encode_strref (enc, SvUTF8 (sv), str, len); 761 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
560 } 762 }
561 else if (SvNOKp (sv)) 763 else if (SvNOKp (sv))
562 encode_nv (enc, sv); 764 encode_nv (enc, sv);
563 else if (SvIOKp (sv)) 765 else if (SvIOKp (sv))
564 { 766 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)) 767 else if (SvROK (sv))
573 encode_rv (enc, SvRV (sv)); 768 encode_rv (enc, SvRV (sv));
574 else if (!SvOK (sv)) 769 else if (!SvOK (sv))
575 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 770 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
576 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 771 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
581} 776}
582 777
583static SV * 778static SV *
584encode_cbor (SV *scalar, CBOR *cbor) 779encode_cbor (SV *scalar, CBOR *cbor)
585{ 780{
586 enc_t enc = { }; 781 enc_t enc = { 0 };
587 782
588 enc.cbor = *cbor; 783 enc.cbor = *cbor;
589 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 784 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
590 enc.cur = SvPVX (enc.sv); 785 enc.cur = SvPVX (enc.sv);
591 enc.end = SvEND (enc.sv); 786 enc.end = SvEND (enc.sv);
592 787
593 SvPOK_only (enc.sv); 788 SvPOK_only (enc.sv);
594 789
595 if (cbor->flags & F_PACK_STRINGS) 790 if (cbor->flags & F_PACK_STRINGS)
596 { 791 {
… …
623 U32 depth; // recursion depth 818 U32 depth; // recursion depth
624 U32 maxdepth; // recursion depth limit 819 U32 maxdepth; // recursion depth limit
625 AV *shareable; 820 AV *shareable;
626 AV *stringref; 821 AV *stringref;
627 SV *decode_tagged; 822 SV *decode_tagged;
823 SV *err_sv; // optional sv for error, needs to be freed
628} dec_t; 824} dec_t;
629 825
630#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);
631 833
632#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;
633 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
634#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)
635#define DEC_DEC_DEPTH --dec->depth 863#define DEC_DEC_DEPTH --dec->depth
636 864
637static UV 865static UV
638decode_uint (dec_t *dec) 866decode_uint (dec_t *dec)
639{ 867{
… …
705 933
706 for (;;) 934 for (;;)
707 { 935 {
708 WANT (1); 936 WANT (1);
709 937
710 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 938 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
711 { 939 {
712 ++dec->cur; 940 ++dec->cur;
713 break; 941 break;
714 } 942 }
715 943
716 av_push (av, decode_sv (dec)); 944 av_push (av, decode_sv (dec));
717 } 945 }
718 } 946 }
719 else 947 else
720 { 948 {
721 int i, len = decode_uint (dec); 949 UV i, len = decode_uint (dec);
722 950
723 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
724 av_fill (av, len - 1); 952 av_fill (av, len - 1);
725 953
726 for (i = 0; i < len; ++i) 954 for (i = 0; i < len; ++i)
… …
729 957
730 DEC_DEC_DEPTH; 958 DEC_DEC_DEPTH;
731 return newRV_noinc ((SV *)av); 959 return newRV_noinc ((SV *)av);
732 960
733fail: 961fail:
734 SvREFCNT_dec (av); 962 SvREFCNT_dec_NN (av);
735 DEC_DEC_DEPTH; 963 DEC_DEC_DEPTH;
736 return &PL_sv_undef; 964 return &PL_sv_undef;
737} 965}
738 966
739static void 967static void
… …
743 // byte or utf-8 strings as keys, but only when !stringref 971 // byte or utf-8 strings as keys, but only when !stringref
744 972
745 if (ecb_expect_true (!dec->stringref)) 973 if (ecb_expect_true (!dec->stringref))
746 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 974 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
747 { 975 {
748 I32 len = decode_uint (dec); 976 STRLEN len = decode_uint (dec);
749 char *key = (char *)dec->cur; 977 char *key = (char *)dec->cur;
750 978
979 WANT (len);
751 dec->cur += len; 980 dec->cur += len;
752 981
753 hv_store (hv, key, len, decode_sv (dec), 0); 982 hv_store (hv, key, len, decode_sv (dec), 0);
754 983
755 return; 984 return;
756 } 985 }
757 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))
758 { 987 {
759 I32 len = decode_uint (dec); 988 STRLEN len = decode_uint (dec);
760 char *key = (char *)dec->cur; 989 char *key = (char *)dec->cur;
761 990
991 WANT (len);
762 dec->cur += len; 992 dec->cur += len;
763 993
764 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 994 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
765 if (!is_utf8_string (key, len)) 995 if (!cbor_is_utf8_string ((U8 *)key, len))
766 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 996 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
767 997
768 hv_store (hv, key, -len, decode_sv (dec), 0); 998 hv_store (hv, key, -len, decode_sv (dec), 0);
769 999
770 return; 1000 return;
771 } 1001 }
772 1002
773 SV *k = decode_sv (dec); 1003 SV *k = decode_sv (dec);
774 SV *v = decode_sv (dec); 1004 SV *v = decode_sv (dec);
775 1005
1006 // we leak memory if uncaught exceptions are thrown by random magical
1007 // methods, and this is hopefully the only place where it can happen,
1008 // so if there is a chance of an exception, take the very slow path.
1009 // since catching exceptions is "undocumented/internal/forbidden" by
1010 // the new p5p powers, we need to call out to a perl function :/
1011 if (ecb_expect_false (SvAMAGIC (k)))
1012 {
1013 dSP;
1014
1015 ENTER; SAVETMPS;
1016 PUSHMARK (SP);
1017 EXTEND (SP, 3);
1018 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
1019 PUSHs (sv_2mortal (k));
1020 PUSHs (sv_2mortal (v));
1021
1022 PUTBACK;
1023 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
1024 SPAGAIN;
1025
1026 FREETMPS; LEAVE;
1027
1028 if (SvTRUE (ERRSV))
1029 ERR_ERRSV;
1030
1031 return;
1032 }
1033
776 hv_store_ent (hv, k, v, 0); 1034 hv_store_ent (hv, k, v, 0);
777 SvREFCNT_dec (k); 1035 SvREFCNT_dec_NN (k);
778 1036
779fail: 1037fail:
780 ; 1038 ;
781} 1039}
782 1040
… …
793 1051
794 for (;;) 1052 for (;;)
795 { 1053 {
796 WANT (1); 1054 WANT (1);
797 1055
798 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1056 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
799 { 1057 {
800 ++dec->cur; 1058 ++dec->cur;
801 break; 1059 break;
802 } 1060 }
803 1061
804 decode_he (dec, hv); 1062 decode_he (dec, hv);
805 } 1063 }
806 } 1064 }
807 else 1065 else
808 { 1066 {
809 int pairs = decode_uint (dec); 1067 UV pairs = decode_uint (dec);
1068
1069 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
810 1070
811 while (pairs--) 1071 while (pairs--)
812 decode_he (dec, hv); 1072 decode_he (dec, hv);
813 } 1073 }
814 1074
815 DEC_DEC_DEPTH; 1075 DEC_DEC_DEPTH;
816 return newRV_noinc ((SV *)hv); 1076 return newRV_noinc ((SV *)hv);
817 1077
818fail: 1078fail:
819 SvREFCNT_dec (hv); 1079 SvREFCNT_dec_NN (hv);
820 DEC_DEC_DEPTH; 1080 DEC_DEC_DEPTH;
821 return &PL_sv_undef; 1081 return &PL_sv_undef;
822} 1082}
823 1083
824static SV * 1084static SV *
825decode_str (dec_t *dec, int utf8) 1085decode_str (dec_t *dec, int utf8)
826{ 1086{
827 SV *sv = 0; 1087 SV *sv = 0;
828 1088
829 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1089 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
830 { 1090 {
831 // indefinite length strings 1091 // indefinite length strings
832 ++dec->cur; 1092 ++dec->cur;
833 1093
834 U8 major = *dec->cur & MAJOR_MISC; 1094 U8 major = *dec->cur & MAJOR_MISC;
… …
869 } 1129 }
870 1130
871 if (utf8) 1131 if (utf8)
872 { 1132 {
873 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 1133 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
874 if (!is_utf8_string (SvPVX (sv), SvCUR (sv))) 1134 if (!cbor_is_utf8_string (SvPVX (sv), SvCUR (sv)))
875 ERR ("corrupted CBOR data (invalid UTF-8 in text string)"); 1135 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
876 1136
877 SvUTF8_on (sv); 1137 SvUTF8_on (sv);
878 } 1138 }
879 1139
… …
902 sv = newRV_noinc (decode_sv (dec)); 1162 sv = newRV_noinc (decode_sv (dec));
903 break; 1163 break;
904 1164
905 case CBOR_TAG_STRINGREF_NAMESPACE: 1165 case CBOR_TAG_STRINGREF_NAMESPACE:
906 { 1166 {
1167 // do not use SAVETMPS/FREETMPS, as these will
1168 // erase mortalised caches, e.g. "shareable"
907 ENTER; SAVETMPS; 1169 ENTER;
908 1170
909 SAVESPTR (dec->stringref); 1171 SAVESPTR (dec->stringref);
910 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1172 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
911 1173
912 sv = decode_sv (dec); 1174 sv = decode_sv (dec);
913 1175
914 FREETMPS; LEAVE; 1176 LEAVE;
915 } 1177 }
916 break; 1178 break;
917 1179
918 case CBOR_TAG_STRINGREF: 1180 case CBOR_TAG_STRINGREF:
919 { 1181 {
920 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1182 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
921 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1183 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
922 1184
923 UV idx = decode_uint (dec); 1185 UV idx = decode_uint (dec);
924 1186
925 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1187 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
926 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1188 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
927 1189
928 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1190 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
929 } 1191 }
930 break; 1192 break;
… …
958 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1220 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
959 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1221 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
960 1222
961 UV idx = decode_uint (dec); 1223 UV idx = decode_uint (dec);
962 1224
963 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1225 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
964 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1226 ERR ("corrupted CBOR data (sharedref index out of bounds)");
965 1227
966 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1228 sv = newRV_inc (AvARRAY (dec->shareable)[idx]);
967 1229
968 if (sv == &PL_sv_undef) 1230 if (sv == &PL_sv_undef)
969 ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled"); 1231 ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
970 } 1232 }
971 break; 1233 break;
972 1234
973 case CBOR_TAG_PERL_OBJECT: 1235 case CBOR_TAG_PERL_OBJECT:
974 { 1236 {
1237 if (dec->cbor.flags & F_FORBID_OBJECTS)
1238 goto filter;
1239
975 sv = decode_sv (dec); 1240 sv = decode_sv (dec);
976 1241
977 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1242 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
978 ERR ("corrupted CBOR data (non-array perl object)"); 1243 ERR ("corrupted CBOR data (non-array perl object)");
979 1244
… …
989 if (!method) 1254 if (!method)
990 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1255 ERR ("cannot decode perl-object (package does not have a THAW method)");
991 1256
992 dSP; 1257 dSP;
993 1258
994 ENTER; SAVETMPS; PUSHMARK (SP); 1259 ENTER; SAVETMPS;
1260 PUSHMARK (SP);
995 EXTEND (SP, len + 1); 1261 EXTEND (SP, len + 1);
996 // we re-bless the reference to get overload and other niceties right 1262 // we re-bless the reference to get overload and other niceties right
997 PUSHs (*av_fetch (av, 0, 1)); 1263 PUSHs (*av_fetch (av, 0, 1));
998 PUSHs (sv_cbor); 1264 PUSHs (sv_cbor);
999 1265
… …
1007 SPAGAIN; 1273 SPAGAIN;
1008 1274
1009 if (SvTRUE (ERRSV)) 1275 if (SvTRUE (ERRSV))
1010 { 1276 {
1011 FREETMPS; LEAVE; 1277 FREETMPS; LEAVE;
1012 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1278 ERR_ERRSV;
1013 } 1279 }
1014 1280
1015 SvREFCNT_dec (sv); 1281 SvREFCNT_dec_NN (sv);
1016 sv = SvREFCNT_inc (POPs); 1282 sv = SvREFCNT_inc (POPs);
1017 1283
1018 PUTBACK; 1284 PUTBACK;
1019 1285
1020 FREETMPS; LEAVE; 1286 FREETMPS; LEAVE;
1021 } 1287 }
1022 break; 1288 break;
1023 1289
1024 default: 1290 default:
1291 filter:
1025 { 1292 {
1293 SV *tag_sv = newSVuv (tag);
1294
1026 sv = decode_sv (dec); 1295 sv = decode_sv (dec);
1027 1296
1028 dSP; 1297 dSP;
1029 ENTER; SAVETMPS; PUSHMARK (SP); 1298 ENTER; SAVETMPS;
1299 PUSHMARK (SP);
1030 EXTEND (SP, 2); 1300 EXTEND (SP, 2);
1031 PUSHs (newSVuv (tag)); 1301 PUSHs (tag_sv);
1032 PUSHs (sv); 1302 PUSHs (sv);
1033 1303
1034 PUTBACK; 1304 PUTBACK;
1035 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1305 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1036 SPAGAIN; 1306 SPAGAIN;
1037 1307
1038 if (SvTRUE (ERRSV)) 1308 if (SvTRUE (ERRSV))
1039 { 1309 {
1310 SvREFCNT_dec_NN (tag_sv);
1040 FREETMPS; LEAVE; 1311 FREETMPS; LEAVE;
1041 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1312 ERR_ERRSV;
1042 } 1313 }
1043 1314
1044 if (count) 1315 if (count)
1045 { 1316 {
1317 SvREFCNT_dec_NN (tag_sv);
1046 SvREFCNT_dec (sv); 1318 SvREFCNT_dec_NN (sv);
1047 sv = SvREFCNT_inc (POPs); 1319 sv = SvREFCNT_inc_NN (TOPs);
1320 SP -= count;
1048 } 1321 }
1049 else 1322 else
1050 { 1323 {
1051 AV *av = newAV (); 1324 AV *av = newAV ();
1052 av_push (av, newSVuv (tag)); 1325 av_push (av, tag_sv);
1053 av_push (av, sv); 1326 av_push (av, sv);
1054 1327
1055 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1328 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1056 ? cbor_tagged_stash 1329 ? cbor_tagged_stash
1057 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1330 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1160} 1433}
1161 1434
1162static SV * 1435static SV *
1163decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1436decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1164{ 1437{
1165 dec_t dec = { }; 1438 dec_t dec = { 0 };
1166 SV *sv; 1439 SV *sv;
1167 STRLEN len; 1440 STRLEN len;
1168 char *data = SvPVbyte (string, len); 1441 char *data = SvPVbyte (string, len);
1169 1442
1170 if (len > cbor->max_size && cbor->max_size) 1443 if (len > cbor->max_size && cbor->max_size)
… …
1186 1459
1187 if (dec.err) 1460 if (dec.err)
1188 { 1461 {
1189 if (dec.shareable) 1462 if (dec.shareable)
1190 { 1463 {
1191 // need to break cyclic links, which whould all be in shareable 1464 // need to break cyclic links, which would all be in shareable
1192 int i; 1465 int i;
1193 SV **svp; 1466 SV **svp;
1194 1467
1195 for (i = av_len (dec.shareable) + 1; i--; ) 1468 for (i = av_len (dec.shareable) + 1; i--; )
1196 if ((svp = av_fetch (dec.shareable, i, 0))) 1469 if ((svp = av_fetch (dec.shareable, i, 0)))
1197 sv_setsv (*svp, &PL_sv_undef); 1470 sv_setsv (*svp, &PL_sv_undef);
1198 } 1471 }
1199 1472
1200 SvREFCNT_dec (sv); 1473 SvREFCNT_dec_NN (sv);
1474
1475 if (dec.err_sv)
1476 sv_2mortal (dec.err_sv);
1477
1201 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1478 croak ("%s, at offset %ld (octet 0x%02x)", dec.err, (long)(dec.cur - (U8 *)data), (int)(uint8_t)*dec.cur);
1202 } 1479 }
1203 1480
1204 sv = sv_2mortal (sv); 1481 sv = sv_2mortal (sv);
1205 1482
1206 return sv; 1483 return sv;
… …
1261 1538
1262 int major = *p >> MAJOR_SHIFT; 1539 int major = *p >> MAJOR_SHIFT;
1263 1540
1264 switch (major) 1541 switch (major)
1265 { 1542 {
1543 case MAJOR_TAG >> MAJOR_SHIFT:
1544 ++count; // tags merely prefix another value
1545 break;
1546
1266 case MAJOR_BYTES >> MAJOR_SHIFT: 1547 case MAJOR_BYTES >> MAJOR_SHIFT:
1267 case MAJOR_TEXT >> MAJOR_SHIFT: 1548 case MAJOR_TEXT >> MAJOR_SHIFT:
1268 case MAJOR_ARRAY >> MAJOR_SHIFT: 1549 case MAJOR_ARRAY >> MAJOR_SHIFT:
1269 case MAJOR_MAP >> MAJOR_SHIFT: 1550 case MAJOR_MAP >> MAJOR_SHIFT:
1270 { 1551 {
… …
1291 1572
1292 break; 1573 break;
1293 1574
1294 case MAJOR_MAP >> MAJOR_SHIFT: 1575 case MAJOR_MAP >> MAJOR_SHIFT:
1295 len <<= 1; 1576 len <<= 1;
1577 /* FALLTHROUGH */
1296 case MAJOR_ARRAY >> MAJOR_SHIFT: 1578 case MAJOR_ARRAY >> MAJOR_SHIFT:
1297 if (len) 1579 if (len)
1298 { 1580 {
1299 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest 1581 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1300 count = len + 1; 1582 count = len + 1;
… …
1345 1627
1346 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1628 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1347 1629
1348 sv_cbor = newSVpv ("CBOR", 0); 1630 sv_cbor = newSVpv ("CBOR", 0);
1349 SvREADONLY_on (sv_cbor); 1631 SvREADONLY_on (sv_cbor);
1632
1633 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1350} 1634}
1351 1635
1352PROTOTYPES: DISABLE 1636PROTOTYPES: DISABLE
1353 1637
1354void CLONE (...) 1638void CLONE (...)
… …
1374 ALIAS: 1658 ALIAS:
1375 shrink = F_SHRINK 1659 shrink = F_SHRINK
1376 allow_unknown = F_ALLOW_UNKNOWN 1660 allow_unknown = F_ALLOW_UNKNOWN
1377 allow_sharing = F_ALLOW_SHARING 1661 allow_sharing = F_ALLOW_SHARING
1378 allow_cycles = F_ALLOW_CYCLES 1662 allow_cycles = F_ALLOW_CYCLES
1663 forbid_objects = F_FORBID_OBJECTS
1379 pack_strings = F_PACK_STRINGS 1664 pack_strings = F_PACK_STRINGS
1665 text_keys = F_TEXT_KEYS
1666 text_strings = F_TEXT_STRINGS
1380 validate_utf8 = F_VALIDATE_UTF8 1667 validate_utf8 = F_VALIDATE_UTF8
1381 PPCODE: 1668 PPCODE:
1382{ 1669{
1383 if (enable) 1670 if (enable)
1384 self->flags |= ix; 1671 self->flags |= ix;
… …
1392 ALIAS: 1679 ALIAS:
1393 get_shrink = F_SHRINK 1680 get_shrink = F_SHRINK
1394 get_allow_unknown = F_ALLOW_UNKNOWN 1681 get_allow_unknown = F_ALLOW_UNKNOWN
1395 get_allow_sharing = F_ALLOW_SHARING 1682 get_allow_sharing = F_ALLOW_SHARING
1396 get_allow_cycles = F_ALLOW_CYCLES 1683 get_allow_cycles = F_ALLOW_CYCLES
1684 get_forbid_objects = F_FORBID_OBJECTS
1397 get_pack_strings = F_PACK_STRINGS 1685 get_pack_strings = F_PACK_STRINGS
1686 get_text_keys = F_TEXT_KEYS
1687 get_text_strings = F_TEXT_STRINGS
1398 get_validate_utf8 = F_VALIDATE_UTF8 1688 get_validate_utf8 = F_VALIDATE_UTF8
1399 PPCODE: 1689 PPCODE:
1400 XPUSHs (boolSV (self->flags & ix)); 1690 XPUSHs (boolSV (self->flags & ix));
1401 1691
1402void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1692void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
… …
1532 cbor_init (&cbor); 1822 cbor_init (&cbor);
1533 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1823 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1534 XPUSHs (cborstr); 1824 XPUSHs (cborstr);
1535} 1825}
1536 1826
1827#ifdef __AFL_COMPILER
1828
1829void
1830afl_init ()
1831 CODE:
1832 __AFL_INIT ();
1833
1834int
1835afl_loop (unsigned int count = 10000)
1836 CODE:
1837 RETVAL = __AFL_LOOP (count);
1838 OUTPUT:
1839 RETVAL
1840
1841#endif
1842

Diff Legend

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