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.66 by root, Sun Nov 29 21:32:01 2020 UTC

… …
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
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_BYTES = 1,
109 AS_TEXT = 2,
110 AS_FLOAT16 = 3,
111 AS_FLOAT32 = 4,
112 AS_FLOAT64 = 5,
113 // possibly future enhancements: float, integer
114};
115
100#define F_SHRINK 0x00000001UL 116#define F_SHRINK 0x00000001UL
101#define F_ALLOW_UNKNOWN 0x00000002UL 117#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL 118#define F_ALLOW_SHARING 0x00000004UL
103#define F_ALLOW_CYCLES 0x00000008UL 119#define F_ALLOW_CYCLES 0x00000008UL
120#define F_FORBID_OBJECTS 0x00000010UL
104#define F_PACK_STRINGS 0x00000010UL 121#define F_PACK_STRINGS 0x00000020UL
122#define F_TEXT_KEYS 0x00000040UL
105#define F_UTF8_STRINGS 0x00000020UL 123#define F_TEXT_STRINGS 0x00000080UL
106#define F_VALIDATE_UTF8 0x00000040UL 124#define F_VALIDATE_UTF8 0x00000100UL
107 125
108#define INIT_SIZE 32 // initial scalar size to be allocated 126#define INIT_SIZE 32 // initial scalar size to be allocated
109 127
110#define SB do { 128#define SB do {
111#define SE } while (0) 129#define SE } while (0)
… …
184 202
185// minimum length of a string to be registered for stringref 203// minimum length of a string to be registered for stringref
186ecb_inline int 204ecb_inline int
187minimum_string_length (UV idx) 205minimum_string_length (UV idx)
188{ 206{
189 return idx > 23 207 return idx <= 23 ? 3
190 ? idx > 0xffU 208 : idx <= 0xffU ? 4
191 ? idx > 0xffffU 209 : idx <= 0xffffU ? 5
192 ? idx > 0xffffffffU 210 : idx <= 0xffffffffU ? 7
193 ? 11 211 : 11;
194 : 7
195 : 5
196 : 4
197 : 3;
198} 212}
199 213
200///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
201// encoder 215// encoder
202 216
… …
215} enc_t; 229} enc_t;
216 230
217ecb_inline void 231ecb_inline void
218need (enc_t *enc, STRLEN len) 232need (enc_t *enc, STRLEN len)
219{ 233{
220 if (ecb_expect_false (enc->cur + len >= enc->end)) 234 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
221 { 235 {
222 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 236 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
223 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 237 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
224 enc->cur = SvPVX (enc->sv) + cur; 238 enc->cur = SvPVX (enc->sv) + cur;
225 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 239 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
231{ 245{
232 need (enc, 1); 246 need (enc, 1);
233 *enc->cur++ = ch; 247 *enc->cur++ = ch;
234} 248}
235 249
250// used for tags, intregers, element counts and so on
236static void 251static void
237encode_uint (enc_t *enc, int major, UV len) 252encode_uint (enc_t *enc, int major, UV len)
238{ 253{
239 need (enc, 9); 254 need (enc, 9);
240 255
… …
271 *enc->cur++ = len >> 8; 286 *enc->cur++ = len >> 8;
272 *enc->cur++ = len; 287 *enc->cur++ = len;
273 } 288 }
274} 289}
275 290
291// encodes a perl value into a CBOR integer
292ecb_inline
293encode_int (enc_t *enc, SV *sv)
294{
295 if (SvIsUV (sv))
296 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
297 else if (SvIVX (sv) >= 0)
298 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
299 else
300 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
301}
302
276ecb_inline void 303ecb_inline void
277encode_tag (enc_t *enc, UV tag) 304encode_tag (enc_t *enc, UV tag)
278{ 305{
279 encode_uint (enc, MAJOR_TAG, tag); 306 encode_uint (enc, MAJOR_TAG, tag);
280} 307}
281 308
309// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
310ecb_noinline static void
311encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
312{
313 STRLEN ulen = len;
314 U8 *p, *pend = (U8 *)str + len;
315
316 for (p = (U8 *)str; p < pend; ++p)
317 ulen += *p >> 7; // count set high bits
318
319 encode_uint (enc, MAJOR_TEXT, ulen);
320
321 need (enc, ulen);
322 for (p = (U8 *)str; p < pend; ++p)
323 if (*p < 0x80)
324 *enc->cur++ = *p;
325 else
326 {
327 *enc->cur++ = 0xc0 + (*p >> 6);
328 *enc->cur++ = 0x80 + (*p & 63);
329 }
330}
331
282ecb_inline void 332ecb_inline void
283encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 333encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
284{ 334{
285 if (ecb_expect_false (enc->cbor.flags & F_UTF8_STRINGS)) 335 if (ecb_expect_false (upgrade_utf8))
286 if (!utf8) 336 if (!utf8)
287 { 337 {
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); 338 encode_str_utf8 (enc, utf8, str, len);
295 return; 339 return;
296 } 340 }
297 341
298 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 342 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
299 need (enc, len); 343 need (enc, len);
300 memcpy (enc->cur, str, len); 344 memcpy (enc->cur, str, len);
301 enc->cur += len; 345 enc->cur += len;
302} 346}
303 347
304static void 348ecb_inline void
305encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 349encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
306{ 350{
307 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 351 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
308 { 352 {
309 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 353 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
310 354
… …
321 sv_setuv (*svp, enc->stringref_idx); 365 sv_setuv (*svp, enc->stringref_idx);
322 ++enc->stringref_idx; 366 ++enc->stringref_idx;
323 } 367 }
324 } 368 }
325 369
326 encode_str (enc, utf8, str, len); 370 encode_str (enc, upgrade_utf8, utf8, str, len);
371}
372
373ecb_inline void
374encode_float16 (enc_t *enc, NV nv)
375{
376 need (enc, 1+2);
377
378 *enc->cur++ = MAJOR_MISC | MISC_FLOAT16;
379
380 uint16_t fp = ecb_float_to_binary16 (nv);
381
382 if (!ecb_big_endian ())
383 fp = ecb_bswap16 (fp);
384
385 memcpy (enc->cur, &fp, 2);
386 enc->cur += 2;
387}
388
389ecb_inline void
390encode_float32 (enc_t *enc, NV nv)
391{
392 need (enc, 1+4);
393
394 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
395
396 uint32_t fp = ecb_float_to_binary32 (nv);
397
398 if (!ecb_big_endian ())
399 fp = ecb_bswap32 (fp);
400
401 memcpy (enc->cur, &fp, 4);
402 enc->cur += 4;
403}
404
405ecb_inline void
406encode_float64 (enc_t *enc, NV nv)
407{
408 need (enc, 1+8);
409
410 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
411
412 uint64_t fp = ecb_double_to_binary64 (nv);
413
414 if (!ecb_big_endian ())
415 fp = ecb_bswap64 (fp);
416
417 memcpy (enc->cur, &fp, 8);
418 enc->cur += 8;
419}
420
421ecb_inline void
422encode_forced (enc_t *enc, UV type, SV *sv)
423{
424 switch (type)
425 {
426 case AS_CBOR:
427 {
428 STRLEN len;
429 char *str = SvPVbyte (sv, len);
430
431 need (enc, len);
432 memcpy (enc->cur, str, len);
433 enc->cur += len;
434 }
435 break;
436
437 case AS_BYTES:
438 {
439 STRLEN len;
440 char *str = SvPVbyte (sv, len);
441 encode_strref (enc, 0, 0, str, len);
442 }
443 break;
444
445 case AS_TEXT:
446 {
447 STRLEN len;
448 char *str = SvPVutf8 (sv, len);
449 encode_strref (enc, 1, 1, str, len);
450 }
451 break;
452
453 case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break;
454 case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break;
455 case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break;
456
457 default:
458 croak ("encountered malformed CBOR::XS::Tagged object");
459 }
327} 460}
328 461
329static void encode_sv (enc_t *enc, SV *sv); 462static void encode_sv (enc_t *enc, SV *sv);
330 463
331static void 464static void
… …
338 471
339 ++enc->depth; 472 ++enc->depth;
340 473
341 encode_uint (enc, MAJOR_ARRAY, len + 1); 474 encode_uint (enc, MAJOR_ARRAY, len + 1);
342 475
343 if (SvMAGICAL (av)) 476 if (ecb_expect_false (SvMAGICAL (av)))
344 for (i = 0; i <= len; ++i) 477 for (i = 0; i <= len; ++i)
345 { 478 {
346 SV **svp = av_fetch (av, i, 0); 479 SV **svp = av_fetch (av, i, 0);
347 encode_sv (enc, svp ? *svp : &PL_sv_undef); 480 encode_sv (enc, svp ? *svp : &PL_sv_undef);
348 } 481 }
… …
367 ++enc->depth; 500 ++enc->depth;
368 501
369 int pairs = hv_iterinit (hv); 502 int pairs = hv_iterinit (hv);
370 int mg = SvMAGICAL (hv); 503 int mg = SvMAGICAL (hv);
371 504
372 if (mg) 505 if (ecb_expect_false (mg))
373 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 506 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
374 else 507 else
375 encode_uint (enc, MAJOR_MAP, pairs); 508 encode_uint (enc, MAJOR_MAP, pairs);
376 509
377 while ((he = hv_iternext (hv))) 510 while ((he = hv_iternext (hv)))
378 { 511 {
379 if (HeKLEN (he) == HEf_SVKEY) 512 if (HeKLEN (he) == HEf_SVKEY)
380 encode_sv (enc, HeSVKEY (he)); 513 encode_sv (enc, HeSVKEY (he));
381 else 514 else
382 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 515 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
383 516
384 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 517 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
385 } 518 }
386 519
387 if (mg) 520 if (ecb_expect_false (mg))
388 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 521 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
389 522
390 --enc->depth; 523 --enc->depth;
391} 524}
392 525
… …
425 else if (stash == tagged_stash) 558 else if (stash == tagged_stash)
426 { 559 {
427 if (svt != SVt_PVAV) 560 if (svt != SVt_PVAV)
428 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 561 croak ("encountered CBOR::XS::Tagged object that isn't an array");
429 562
563 switch (av_len ((AV *)sv))
564 {
565 case 2-1:
566 // actually a tagged value
430 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); 567 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
431 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 568 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
569 break;
570
571 case 3-1:
572 // a forced type [value, type, undef]
573 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
574 break;
575
576 default:
577 croak ("encountered malformed CBOR::XS::Tagged object");
578 }
432 579
433 return; 580 return;
434 } 581 }
435 } 582 }
436 583
437 if (ecb_expect_false (SvREFCNT (sv) > 1) 584 if (ecb_expect_false (SvREFCNT (sv) > 1)
438 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 585 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
439 { 586 {
440 if (!enc->shareable) 587 if (ecb_expect_false (!enc->shareable))
441 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 588 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
442 589
443 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 590 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
444 591
445 if (SvOK (*svp)) 592 if (SvOK (*svp))
… …
459 if (ecb_expect_false (SvOBJECT (sv))) 606 if (ecb_expect_false (SvOBJECT (sv)))
460 { 607 {
461 HV *stash = SvSTASH (sv); 608 HV *stash = SvSTASH (sv);
462 GV *method; 609 GV *method;
463 610
611 if (enc->cbor.flags & F_FORBID_OBJECTS)
612 croak ("encountered object '%s', but forbid_objects is enabled",
613 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
464 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 614 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
465 { 615 {
466 dSP; 616 dSP;
467 617
468 ENTER; SAVETMPS; 618 ENTER; SAVETMPS;
469 PUSHMARK (SP); 619 PUSHMARK (SP);
… …
488 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 638 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
489 { 639 {
490 dSP; 640 dSP;
491 641
492 ENTER; SAVETMPS; 642 ENTER; SAVETMPS;
493 SAVESTACK_POS ();
494 PUSHMARK (SP); 643 PUSHMARK (SP);
495 EXTEND (SP, 2); 644 EXTEND (SP, 2);
496 // we re-bless the reference to get overload and other niceties right 645 // we re-bless the reference to get overload and other niceties right
497 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 646 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
498 PUSHs (sv_cbor); 647 PUSHs (sv_cbor);
… …
505 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 654 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)); 655 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
507 656
508 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 657 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
509 encode_uint (enc, MAJOR_ARRAY, count + 1); 658 encode_uint (enc, MAJOR_ARRAY, count + 1);
510 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 659 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
511 660
512 while (count) 661 {
662 int i;
663
664 for (i = 0; i < count; ++i)
513 encode_sv (enc, SP[1 - count--]); 665 encode_sv (enc, SP[i + 1 - count]);
666
667 SP -= count;
668 }
514 669
515 PUTBACK; 670 PUTBACK;
516 671
517 FREETMPS; LEAVE; 672 FREETMPS; LEAVE;
518 } 673 }
… …
540 695
541 if (ecb_expect_false (nv == (NV)(U32)nv)) 696 if (ecb_expect_false (nv == (NV)(U32)nv))
542 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 697 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
543 //TODO: maybe I32? 698 //TODO: maybe I32?
544 else if (ecb_expect_false (nv == (float)nv)) 699 else if (ecb_expect_false (nv == (float)nv))
545 { 700 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 701 else
557 { 702 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} 703}
569 704
570static void 705static void
571encode_sv (enc_t *enc, SV *sv) 706encode_sv (enc_t *enc, SV *sv)
572{ 707{
… …
574 709
575 if (SvPOKp (sv)) 710 if (SvPOKp (sv))
576 { 711 {
577 STRLEN len; 712 STRLEN len;
578 char *str = SvPV (sv, len); 713 char *str = SvPV (sv, len);
579 encode_strref (enc, SvUTF8 (sv), str, len); 714 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
580 } 715 }
581 else if (SvNOKp (sv)) 716 else if (SvNOKp (sv))
582 encode_nv (enc, sv); 717 encode_nv (enc, sv);
583 else if (SvIOKp (sv)) 718 else if (SvIOKp (sv))
584 { 719 encode_int (e,v 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)) 720 else if (SvROK (sv))
593 encode_rv (enc, SvRV (sv)); 721 encode_rv (enc, SvRV (sv));
594 else if (!SvOK (sv)) 722 else if (!SvOK (sv))
595 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 723 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
596 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 724 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
603static SV * 731static SV *
604encode_cbor (SV *scalar, CBOR *cbor) 732encode_cbor (SV *scalar, CBOR *cbor)
605{ 733{
606 enc_t enc = { 0 }; 734 enc_t enc = { 0 };
607 735
608 enc.cbor = *cbor; 736 enc.cbor = *cbor;
609 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 737 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
610 enc.cur = SvPVX (enc.sv); 738 enc.cur = SvPVX (enc.sv);
611 enc.end = SvEND (enc.sv); 739 enc.end = SvEND (enc.sv);
612 740
613 SvPOK_only (enc.sv); 741 SvPOK_only (enc.sv);
614 742
615 if (cbor->flags & F_PACK_STRINGS) 743 if (cbor->flags & F_PACK_STRINGS)
616 { 744 {
… …
643 U32 depth; // recursion depth 771 U32 depth; // recursion depth
644 U32 maxdepth; // recursion depth limit 772 U32 maxdepth; // recursion depth limit
645 AV *shareable; 773 AV *shareable;
646 AV *stringref; 774 AV *stringref;
647 SV *decode_tagged; 775 SV *decode_tagged;
776 SV *err_sv; // optional sv for error, needs to be freed
648} dec_t; 777} dec_t;
649 778
650#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 779// set dec->err to ERRSV
780ecb_cold static void
781err_errsv (dec_t *dec)
782{
783 if (!dec->err)
784 {
785 dec->err_sv = newSVsv (ERRSV);
651 786
652#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 787 // chop off the trailing \n
788 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
789 *SvEND (dec->err_sv) = 0;
653 790
791 dec->err = SvPVutf8_nolen (dec->err_sv);
792 }
793}
794
795// the following functions are used to reduce code size and help the compiler to optimise
796ecb_cold static void
797err_set (dec_t *dec, const char *reason)
798{
799 if (!dec->err)
800 dec->err = reason;
801}
802
803ecb_cold static void
804err_unexpected_end (dec_t *dec)
805{
806 err_set (dec, "unexpected end of CBOR data");
807}
808
809#define ERR_DO(do) SB do; goto fail; SE
810#define ERR(reason) ERR_DO (err_set (dec, reason))
811#define ERR_ERRSV ERR_DO (err_errsv (dec))
812
813#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
814
654#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 815#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 816#define DEC_DEC_DEPTH --dec->depth
656 817
657static UV 818static UV
658decode_uint (dec_t *dec) 819decode_uint (dec_t *dec)
659{ 820{
… …
725 886
726 for (;;) 887 for (;;)
727 { 888 {
728 WANT (1); 889 WANT (1);
729 890
730 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 891 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
731 { 892 {
732 ++dec->cur; 893 ++dec->cur;
733 break; 894 break;
734 } 895 }
735 896
736 av_push (av, decode_sv (dec)); 897 av_push (av, decode_sv (dec));
737 } 898 }
738 } 899 }
739 else 900 else
740 { 901 {
741 int i, len = decode_uint (dec); 902 UV i, len = decode_uint (dec);
742 903
743 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 904 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); 905 av_fill (av, len - 1);
745 906
746 for (i = 0; i < len; ++i) 907 for (i = 0; i < len; ++i)
… …
749 910
750 DEC_DEC_DEPTH; 911 DEC_DEC_DEPTH;
751 return newRV_noinc ((SV *)av); 912 return newRV_noinc ((SV *)av);
752 913
753fail: 914fail:
754 SvREFCNT_dec (av); 915 SvREFCNT_dec_NN (av);
755 DEC_DEC_DEPTH; 916 DEC_DEC_DEPTH;
756 return &PL_sv_undef; 917 return &PL_sv_undef;
757} 918}
758 919
759static void 920static void
… …
763 // byte or utf-8 strings as keys, but only when !stringref 924 // byte or utf-8 strings as keys, but only when !stringref
764 925
765 if (ecb_expect_true (!dec->stringref)) 926 if (ecb_expect_true (!dec->stringref))
766 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 927 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
767 { 928 {
768 I32 len = decode_uint (dec); 929 STRLEN len = decode_uint (dec);
769 char *key = (char *)dec->cur; 930 char *key = (char *)dec->cur;
770 931
771 WANT (len); 932 WANT (len);
772 dec->cur += len; 933 dec->cur += len;
773 934
… …
775 936
776 return; 937 return;
777 } 938 }
778 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 939 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
779 { 940 {
780 I32 len = decode_uint (dec); 941 STRLEN len = decode_uint (dec);
781 char *key = (char *)dec->cur; 942 char *key = (char *)dec->cur;
782 943
783 WANT (len); 944 WANT (len);
784 dec->cur += len; 945 dec->cur += len;
785 946
… …
793 } 954 }
794 955
795 SV *k = decode_sv (dec); 956 SV *k = decode_sv (dec);
796 SV *v = decode_sv (dec); 957 SV *v = decode_sv (dec);
797 958
959 // we leak memory if uncaught exceptions are thrown by random magical
960 // methods, and this is hopefully the only place where it can happen,
961 // so if there is a chance of an exception, take the very slow path.
962 // since catching exceptions is "undocumented/internal/forbidden" by
963 // the new p5p powers, we need to call out to a perl function :/
964 if (ecb_expect_false (SvAMAGIC (k)))
965 {
966 dSP;
967
968 ENTER; SAVETMPS;
969 PUSHMARK (SP);
970 EXTEND (SP, 3);
971 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
972 PUSHs (sv_2mortal (k));
973 PUSHs (sv_2mortal (v));
974
975 PUTBACK;
976 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
977 SPAGAIN;
978
979 FREETMPS; LEAVE;
980
981 if (SvTRUE (ERRSV))
982 ERR_ERRSV;
983
984 return;
985 }
986
798 hv_store_ent (hv, k, v, 0); 987 hv_store_ent (hv, k, v, 0);
799 SvREFCNT_dec (k); 988 SvREFCNT_dec_NN (k);
800 989
801fail: 990fail:
802 ; 991 ;
803} 992}
804 993
… …
815 1004
816 for (;;) 1005 for (;;)
817 { 1006 {
818 WANT (1); 1007 WANT (1);
819 1008
820 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1009 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
821 { 1010 {
822 ++dec->cur; 1011 ++dec->cur;
823 break; 1012 break;
824 } 1013 }
825 1014
826 decode_he (dec, hv); 1015 decode_he (dec, hv);
827 } 1016 }
828 } 1017 }
829 else 1018 else
830 { 1019 {
831 int pairs = decode_uint (dec); 1020 UV pairs = decode_uint (dec);
1021
1022 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
832 1023
833 while (pairs--) 1024 while (pairs--)
834 decode_he (dec, hv); 1025 decode_he (dec, hv);
835 } 1026 }
836 1027
837 DEC_DEC_DEPTH; 1028 DEC_DEC_DEPTH;
838 return newRV_noinc ((SV *)hv); 1029 return newRV_noinc ((SV *)hv);
839 1030
840fail: 1031fail:
841 SvREFCNT_dec (hv); 1032 SvREFCNT_dec_NN (hv);
842 DEC_DEC_DEPTH; 1033 DEC_DEC_DEPTH;
843 return &PL_sv_undef; 1034 return &PL_sv_undef;
844} 1035}
845 1036
846static SV * 1037static SV *
847decode_str (dec_t *dec, int utf8) 1038decode_str (dec_t *dec, int utf8)
848{ 1039{
849 SV *sv = 0; 1040 SV *sv = 0;
850 1041
851 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1042 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
852 { 1043 {
853 // indefinite length strings 1044 // indefinite length strings
854 ++dec->cur; 1045 ++dec->cur;
855 1046
856 U8 major = *dec->cur & MAJOR_MISC; 1047 U8 major = *dec->cur & MAJOR_MISC;
… …
924 sv = newRV_noinc (decode_sv (dec)); 1115 sv = newRV_noinc (decode_sv (dec));
925 break; 1116 break;
926 1117
927 case CBOR_TAG_STRINGREF_NAMESPACE: 1118 case CBOR_TAG_STRINGREF_NAMESPACE:
928 { 1119 {
1120 // do not use SAVETMPS/FREETMPS, as these will
1121 // erase mortalised caches, e.g. "shareable"
929 ENTER; SAVETMPS; 1122 ENTER;
930 1123
931 SAVESPTR (dec->stringref); 1124 SAVESPTR (dec->stringref);
932 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1125 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
933 1126
934 sv = decode_sv (dec); 1127 sv = decode_sv (dec);
935 1128
936 FREETMPS; LEAVE; 1129 LEAVE;
937 } 1130 }
938 break; 1131 break;
939 1132
940 case CBOR_TAG_STRINGREF: 1133 case CBOR_TAG_STRINGREF:
941 { 1134 {
942 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1135 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
943 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1136 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
944 1137
945 UV idx = decode_uint (dec); 1138 UV idx = decode_uint (dec);
946 1139
947 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1140 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
948 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1141 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
949 1142
950 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1143 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
951 } 1144 }
952 break; 1145 break;
… …
980 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1173 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
981 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1174 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
982 1175
983 UV idx = decode_uint (dec); 1176 UV idx = decode_uint (dec);
984 1177
985 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1178 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
986 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1179 ERR ("corrupted CBOR data (sharedref index out of bounds)");
987 1180
988 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1181 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
989 1182
990 if (sv == &PL_sv_undef) 1183 if (sv == &PL_sv_undef)
… …
992 } 1185 }
993 break; 1186 break;
994 1187
995 case CBOR_TAG_PERL_OBJECT: 1188 case CBOR_TAG_PERL_OBJECT:
996 { 1189 {
1190 if (dec->cbor.flags & F_FORBID_OBJECTS)
1191 goto filter;
1192
997 sv = decode_sv (dec); 1193 sv = decode_sv (dec);
998 1194
999 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1195 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1000 ERR ("corrupted CBOR data (non-array perl object)"); 1196 ERR ("corrupted CBOR data (non-array perl object)");
1001 1197
… …
1030 SPAGAIN; 1226 SPAGAIN;
1031 1227
1032 if (SvTRUE (ERRSV)) 1228 if (SvTRUE (ERRSV))
1033 { 1229 {
1034 FREETMPS; LEAVE; 1230 FREETMPS; LEAVE;
1035 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1231 ERR_ERRSV;
1036 } 1232 }
1037 1233
1038 SvREFCNT_dec (sv); 1234 SvREFCNT_dec_NN (sv);
1039 sv = SvREFCNT_inc (POPs); 1235 sv = SvREFCNT_inc (POPs);
1040 1236
1041 PUTBACK; 1237 PUTBACK;
1042 1238
1043 FREETMPS; LEAVE; 1239 FREETMPS; LEAVE;
1044 } 1240 }
1045 break; 1241 break;
1046 1242
1047 default: 1243 default:
1244 filter:
1048 { 1245 {
1246 SV *tag_sv = newSVuv (tag);
1247
1049 sv = decode_sv (dec); 1248 sv = decode_sv (dec);
1050 1249
1051 dSP; 1250 dSP;
1052 ENTER; SAVETMPS; 1251 ENTER; SAVETMPS;
1053 SAVESTACK_POS ();
1054 PUSHMARK (SP); 1252 PUSHMARK (SP);
1055 EXTEND (SP, 2); 1253 EXTEND (SP, 2);
1056 PUSHs (newSVuv (tag)); 1254 PUSHs (tag_sv);
1057 PUSHs (sv); 1255 PUSHs (sv);
1058 1256
1059 PUTBACK; 1257 PUTBACK;
1060 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1258 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1061 SPAGAIN; 1259 SPAGAIN;
1062 1260
1063 if (SvTRUE (ERRSV)) 1261 if (SvTRUE (ERRSV))
1064 { 1262 {
1263 SvREFCNT_dec_NN (tag_sv);
1065 FREETMPS; LEAVE; 1264 FREETMPS; LEAVE;
1066 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1265 ERR_ERRSV;
1067 } 1266 }
1068 1267
1069 if (count) 1268 if (count)
1070 { 1269 {
1270 SvREFCNT_dec_NN (tag_sv);
1071 SvREFCNT_dec (sv); 1271 SvREFCNT_dec_NN (sv);
1072 sv = SvREFCNT_inc (POPs); 1272 sv = SvREFCNT_inc_NN (TOPs);
1273 SP -= count;
1073 } 1274 }
1074 else 1275 else
1075 { 1276 {
1076 AV *av = newAV (); 1277 AV *av = newAV ();
1077 av_push (av, newSVuv (tag)); 1278 av_push (av, tag_sv);
1078 av_push (av, sv); 1279 av_push (av, sv);
1079 1280
1080 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1281 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1081 ? cbor_tagged_stash 1282 ? cbor_tagged_stash
1082 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1283 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1211 1412
1212 if (dec.err) 1413 if (dec.err)
1213 { 1414 {
1214 if (dec.shareable) 1415 if (dec.shareable)
1215 { 1416 {
1216 // need to break cyclic links, which whould all be in shareable 1417 // need to break cyclic links, which would all be in shareable
1217 int i; 1418 int i;
1218 SV **svp; 1419 SV **svp;
1219 1420
1220 for (i = av_len (dec.shareable) + 1; i--; ) 1421 for (i = av_len (dec.shareable) + 1; i--; )
1221 if ((svp = av_fetch (dec.shareable, i, 0))) 1422 if ((svp = av_fetch (dec.shareable, i, 0)))
1222 sv_setsv (*svp, &PL_sv_undef); 1423 sv_setsv (*svp, &PL_sv_undef);
1223 } 1424 }
1224 1425
1225 SvREFCNT_dec (sv); 1426 SvREFCNT_dec_NN (sv);
1427
1428 if (dec.err_sv)
1429 sv_2mortal (dec.err_sv);
1430
1226 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1431 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1227 } 1432 }
1228 1433
1229 sv = sv_2mortal (sv); 1434 sv = sv_2mortal (sv);
1230 1435
… …
1374 1579
1375 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1580 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1376 1581
1377 sv_cbor = newSVpv ("CBOR", 0); 1582 sv_cbor = newSVpv ("CBOR", 0);
1378 SvREADONLY_on (sv_cbor); 1583 SvREADONLY_on (sv_cbor);
1584
1585 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1379} 1586}
1380 1587
1381PROTOTYPES: DISABLE 1588PROTOTYPES: DISABLE
1382 1589
1383void CLONE (...) 1590void CLONE (...)
… …
1403 ALIAS: 1610 ALIAS:
1404 shrink = F_SHRINK 1611 shrink = F_SHRINK
1405 allow_unknown = F_ALLOW_UNKNOWN 1612 allow_unknown = F_ALLOW_UNKNOWN
1406 allow_sharing = F_ALLOW_SHARING 1613 allow_sharing = F_ALLOW_SHARING
1407 allow_cycles = F_ALLOW_CYCLES 1614 allow_cycles = F_ALLOW_CYCLES
1615 forbid_objects = F_FORBID_OBJECTS
1408 pack_strings = F_PACK_STRINGS 1616 pack_strings = F_PACK_STRINGS
1617 text_keys = F_TEXT_KEYS
1409 utf8_strings = F_UTF8_STRINGS 1618 text_strings = F_TEXT_STRINGS
1410 validate_utf8 = F_VALIDATE_UTF8 1619 validate_utf8 = F_VALIDATE_UTF8
1411 PPCODE: 1620 PPCODE:
1412{ 1621{
1413 if (enable) 1622 if (enable)
1414 self->flags |= ix; 1623 self->flags |= ix;
… …
1422 ALIAS: 1631 ALIAS:
1423 get_shrink = F_SHRINK 1632 get_shrink = F_SHRINK
1424 get_allow_unknown = F_ALLOW_UNKNOWN 1633 get_allow_unknown = F_ALLOW_UNKNOWN
1425 get_allow_sharing = F_ALLOW_SHARING 1634 get_allow_sharing = F_ALLOW_SHARING
1426 get_allow_cycles = F_ALLOW_CYCLES 1635 get_allow_cycles = F_ALLOW_CYCLES
1636 get_forbid_objects = F_FORBID_OBJECTS
1427 get_pack_strings = F_PACK_STRINGS 1637 get_pack_strings = F_PACK_STRINGS
1638 get_text_keys = F_TEXT_KEYS
1639 get_text_strings = F_TEXT_STRINGS
1428 get_validate_utf8 = F_VALIDATE_UTF8 1640 get_validate_utf8 = F_VALIDATE_UTF8
1429 PPCODE: 1641 PPCODE:
1430 XPUSHs (boolSV (self->flags & ix)); 1642 XPUSHs (boolSV (self->flags & ix));
1431 1643
1432void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1644void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
… …
1562 cbor_init (&cbor); 1774 cbor_init (&cbor);
1563 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1775 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1564 XPUSHs (cborstr); 1776 XPUSHs (cborstr);
1565} 1777}
1566 1778
1779#ifdef __AFL_COMPILER
1780
1781void
1782afl_init ()
1783 CODE:
1784 __AFL_INIT ();
1785
1786int
1787afl_loop (unsigned int count = 10000)
1788 CODE:
1789 RETVAL = __AFL_LOOP (count);
1790 OUTPUT:
1791 RETVAL
1792
1793#endif
1794

Diff Legend

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