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.63 by root, Sat Nov 26 04:50:58 2016 UTC vs.
Revision 1.70 by root, Fri Dec 4 02:57:14 2020 UTC

… …
99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
100 100
101 CBOR_TAG_MAGIC = 55799, // self-describe cbor 101 CBOR_TAG_MAGIC = 55799, // self-describe cbor
102}; 102};
103 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
104#define F_SHRINK 0x00000001UL 118#define F_SHRINK 0x00000001UL
105#define F_ALLOW_UNKNOWN 0x00000002UL 119#define F_ALLOW_UNKNOWN 0x00000002UL
106#define F_ALLOW_SHARING 0x00000004UL 120#define F_ALLOW_SHARING 0x00000004UL
107#define F_ALLOW_CYCLES 0x00000008UL 121#define F_ALLOW_CYCLES 0x00000008UL
108#define F_FORBID_OBJECTS 0x00000010UL 122#define F_FORBID_OBJECTS 0x00000010UL
… …
226 enc->cur = SvPVX (enc->sv) + cur; 240 enc->cur = SvPVX (enc->sv) + cur;
227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 241 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
228 } 242 }
229} 243}
230 244
245static void encode_sv (enc_t *enc, SV *sv);
246
231ecb_inline void 247ecb_inline void
232encode_ch (enc_t *enc, char ch) 248encode_ch (enc_t *enc, char ch)
233{ 249{
234 need (enc, 1); 250 need (enc, 1);
235 *enc->cur++ = ch; 251 *enc->cur++ = ch;
236} 252}
237 253
254// used for tags, intregers, element counts and so on
238static void 255static void
239encode_uint (enc_t *enc, int major, UV len) 256encode_uint (enc_t *enc, int major, UV len)
240{ 257{
241 need (enc, 9); 258 need (enc, 9);
242 259
… …
273 *enc->cur++ = len >> 8; 290 *enc->cur++ = len >> 8;
274 *enc->cur++ = len; 291 *enc->cur++ = len;
275 } 292 }
276} 293}
277 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
278ecb_inline void 307ecb_inline void
279encode_tag (enc_t *enc, UV tag) 308encode_tag (enc_t *enc, UV tag)
280{ 309{
281 encode_uint (enc, MAJOR_TAG, tag); 310 encode_uint (enc, MAJOR_TAG, tag);
282} 311}
… …
343 } 372 }
344 373
345 encode_str (enc, upgrade_utf8, utf8, str, len); 374 encode_str (enc, upgrade_utf8, utf8, str, len);
346} 375}
347 376
348static 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}
349 507
350static void 508static void
351encode_av (enc_t *enc, AV *av) 509encode_av (enc_t *enc, AV *av)
352{ 510{
353 int i, len = av_len (av); 511 int i, len = av_len (av);
… …
431 589
432 HV *stash = SvSTASH (sv); 590 HV *stash = SvSTASH (sv);
433 591
434 if (stash == boolean_stash) 592 if (stash == boolean_stash)
435 { 593 {
436 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE); 594 encode_bool (enc, SvIV (sv));
437 return; 595 return;
438 } 596 }
439 else if (stash == error_stash) 597 else if (stash == error_stash)
440 { 598 {
441 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF); 599 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
… …
444 else if (stash == tagged_stash) 602 else if (stash == tagged_stash)
445 { 603 {
446 if (svt != SVt_PVAV) 604 if (svt != SVt_PVAV)
447 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 605 croak ("encountered CBOR::XS::Tagged object that isn't an array");
448 606
607 switch (av_len ((AV *)sv))
608 {
609 case 2-1:
610 // actually a tagged value
449 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)));
450 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 }
451 623
452 return; 624 return;
453 } 625 }
454 } 626 }
455 627
… …
510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 682 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
511 { 683 {
512 dSP; 684 dSP;
513 685
514 ENTER; SAVETMPS; 686 ENTER; SAVETMPS;
515 SAVESTACK_POS ();
516 PUSHMARK (SP); 687 PUSHMARK (SP);
517 EXTEND (SP, 2); 688 EXTEND (SP, 2);
518 // 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
519 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 690 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
520 PUSHs (sv_cbor); 691 PUSHs (sv_cbor);
… …
529 700
530 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 701 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
531 encode_uint (enc, MAJOR_ARRAY, count + 1); 702 encode_uint (enc, MAJOR_ARRAY, count + 1);
532 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 703 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
533 704
534 while (count) 705 {
706 int i;
707
708 for (i = 0; i < count; ++i)
535 encode_sv (enc, SP[1 - count--]); 709 encode_sv (enc, SP[i + 1 - count]);
710
711 SP -= count;
712 }
536 713
537 PUTBACK; 714 PUTBACK;
538 715
539 FREETMPS; LEAVE; 716 FREETMPS; LEAVE;
540 } 717 }
… …
562 739
563 if (ecb_expect_false (nv == (NV)(U32)nv)) 740 if (ecb_expect_false (nv == (NV)(U32)nv))
564 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 741 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
565 //TODO: maybe I32? 742 //TODO: maybe I32?
566 else if (ecb_expect_false (nv == (float)nv)) 743 else if (ecb_expect_false (nv == (float)nv))
567 { 744 encode_float32 (enc, nv);
568 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
569
570 uint32_t fp = ecb_float_to_binary32 (nv);
571
572 if (!ecb_big_endian ())
573 fp = ecb_bswap32 (fp);
574
575 memcpy (enc->cur, &fp, 4);
576 enc->cur += 4;
577 }
578 else 745 else
579 { 746 encode_float64 (enc, nv);
580 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
581
582 uint64_t fp = ecb_double_to_binary64 (nv);
583
584 if (!ecb_big_endian ())
585 fp = ecb_bswap64 (fp);
586
587 memcpy (enc->cur, &fp, 8);
588 enc->cur += 8;
589 }
590} 747}
591 748
592static void 749static void
593encode_sv (enc_t *enc, SV *sv) 750encode_sv (enc_t *enc, SV *sv)
594{ 751{
… …
601 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len); 758 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
602 } 759 }
603 else if (SvNOKp (sv)) 760 else if (SvNOKp (sv))
604 encode_nv (enc, sv); 761 encode_nv (enc, sv);
605 else if (SvIOKp (sv)) 762 else if (SvIOKp (sv))
606 { 763 encode_int (enc, sv);
607 if (SvIsUV (sv))
608 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
609 else if (SvIVX (sv) >= 0)
610 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
611 else
612 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
613 }
614 else if (SvROK (sv)) 764 else if (SvROK (sv))
615 encode_rv (enc, SvRV (sv)); 765 encode_rv (enc, SvRV (sv));
616 else if (!SvOK (sv)) 766 else if (!SvOK (sv))
617 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 767 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
618 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 768 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
780 930
781 for (;;) 931 for (;;)
782 { 932 {
783 WANT (1); 933 WANT (1);
784 934
785 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 935 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
786 { 936 {
787 ++dec->cur; 937 ++dec->cur;
788 break; 938 break;
789 } 939 }
790 940
… …
898 1048
899 for (;;) 1049 for (;;)
900 { 1050 {
901 WANT (1); 1051 WANT (1);
902 1052
903 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1053 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
904 { 1054 {
905 ++dec->cur; 1055 ++dec->cur;
906 break; 1056 break;
907 } 1057 }
908 1058
… …
1029 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1179 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1030 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1180 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
1031 1181
1032 UV idx = decode_uint (dec); 1182 UV idx = decode_uint (dec);
1033 1183
1034 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1184 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
1035 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)");
1036 1186
1037 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1187 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
1038 } 1188 }
1039 break; 1189 break;
… …
1067 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1217 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1068 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1218 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1069 1219
1070 UV idx = decode_uint (dec); 1220 UV idx = decode_uint (dec);
1071 1221
1072 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1222 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1073 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1223 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1074 1224
1075 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1225 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1076 1226
1077 if (sv == &PL_sv_undef) 1227 if (sv == &PL_sv_undef)
… …
1141 1291
1142 sv = decode_sv (dec); 1292 sv = decode_sv (dec);
1143 1293
1144 dSP; 1294 dSP;
1145 ENTER; SAVETMPS; 1295 ENTER; SAVETMPS;
1146 SAVESTACK_POS ();
1147 PUSHMARK (SP); 1296 PUSHMARK (SP);
1148 EXTEND (SP, 2); 1297 EXTEND (SP, 2);
1149 PUSHs (tag_sv); 1298 PUSHs (tag_sv);
1150 PUSHs (sv); 1299 PUSHs (sv);
1151 1300
… …
1162 1311
1163 if (count) 1312 if (count)
1164 { 1313 {
1165 SvREFCNT_dec_NN (tag_sv); 1314 SvREFCNT_dec_NN (tag_sv);
1166 SvREFCNT_dec_NN (sv); 1315 SvREFCNT_dec_NN (sv);
1167 sv = SvREFCNT_inc_NN (POPs); 1316 sv = SvREFCNT_inc_NN (TOPs);
1317 SP -= count;
1168 } 1318 }
1169 else 1319 else
1170 { 1320 {
1171 AV *av = newAV (); 1321 AV *av = newAV ();
1172 av_push (av, tag_sv); 1322 av_push (av, tag_sv);
… …
1668 cbor_init (&cbor); 1818 cbor_init (&cbor);
1669 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1819 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1670 XPUSHs (cborstr); 1820 XPUSHs (cborstr);
1671} 1821}
1672 1822
1823#ifdef __AFL_COMPILER
1824
1825void
1826afl_init ()
1827 CODE:
1828 __AFL_INIT ();
1829
1830int
1831afl_loop (unsigned int count = 10000)
1832 CODE:
1833 RETVAL = __AFL_LOOP (count);
1834 OUTPUT:
1835 RETVAL
1836
1837#endif
1838

Diff Legend

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