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.59 by root, Fri Nov 25 23:37:27 2016 UTC vs.
Revision 1.63 by root, Sat Nov 26 04:50:58 2016 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
… …
99 103
100#define F_SHRINK 0x00000001UL 104#define F_SHRINK 0x00000001UL
101#define F_ALLOW_UNKNOWN 0x00000002UL 105#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL 106#define F_ALLOW_SHARING 0x00000004UL
103#define F_ALLOW_CYCLES 0x00000008UL 107#define F_ALLOW_CYCLES 0x00000008UL
108#define F_FORBID_OBJECTS 0x00000010UL
104#define F_PACK_STRINGS 0x00000010UL 109#define F_PACK_STRINGS 0x00000020UL
105#define F_TEXT_KEYS 0x00000020UL 110#define F_TEXT_KEYS 0x00000040UL
106#define F_TEXT_STRINGS 0x00000040UL 111#define F_TEXT_STRINGS 0x00000080UL
107#define F_VALIDATE_UTF8 0x00000080UL 112#define F_VALIDATE_UTF8 0x00000100UL
108 113
109#define INIT_SIZE 32 // initial scalar size to be allocated 114#define INIT_SIZE 32 // initial scalar size to be allocated
110 115
111#define SB do { 116#define SB do {
112#define SE } while (0) 117#define SE } while (0)
… …
185 190
186// minimum length of a string to be registered for stringref 191// minimum length of a string to be registered for stringref
187ecb_inline int 192ecb_inline int
188minimum_string_length (UV idx) 193minimum_string_length (UV idx)
189{ 194{
190 return idx > 23 195 return idx <= 23 ? 3
191 ? idx > 0xffU 196 : idx <= 0xffU ? 4
192 ? idx > 0xffffU 197 : idx <= 0xffffU ? 5
193 ? idx > 0xffffffffU 198 : idx <= 0xffffffffU ? 7
194 ? 11 199 : 11;
195 : 7
196 : 5
197 : 4
198 : 3;
199} 200}
200 201
201///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
202// encoder 203// encoder
203 204
… …
216} enc_t; 217} enc_t;
217 218
218ecb_inline void 219ecb_inline void
219need (enc_t *enc, STRLEN len) 220need (enc_t *enc, STRLEN len)
220{ 221{
221 if (ecb_expect_false (enc->cur + len >= enc->end)) 222 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
222 { 223 {
223 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 224 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
224 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 225 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
225 enc->cur = SvPVX (enc->sv) + cur; 226 enc->cur = SvPVX (enc->sv) + cur;
226 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
356 357
357 ++enc->depth; 358 ++enc->depth;
358 359
359 encode_uint (enc, MAJOR_ARRAY, len + 1); 360 encode_uint (enc, MAJOR_ARRAY, len + 1);
360 361
361 if (SvMAGICAL (av)) 362 if (ecb_expect_false (SvMAGICAL (av)))
362 for (i = 0; i <= len; ++i) 363 for (i = 0; i <= len; ++i)
363 { 364 {
364 SV **svp = av_fetch (av, i, 0); 365 SV **svp = av_fetch (av, i, 0);
365 encode_sv (enc, svp ? *svp : &PL_sv_undef); 366 encode_sv (enc, svp ? *svp : &PL_sv_undef);
366 } 367 }
… …
385 ++enc->depth; 386 ++enc->depth;
386 387
387 int pairs = hv_iterinit (hv); 388 int pairs = hv_iterinit (hv);
388 int mg = SvMAGICAL (hv); 389 int mg = SvMAGICAL (hv);
389 390
390 if (mg) 391 if (ecb_expect_false (mg))
391 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
392 else 393 else
393 encode_uint (enc, MAJOR_MAP, pairs); 394 encode_uint (enc, MAJOR_MAP, pairs);
394 395
395 while ((he = hv_iternext (hv))) 396 while ((he = hv_iternext (hv)))
… …
400 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 401 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
401 402
402 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 403 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
403 } 404 }
404 405
405 if (mg) 406 if (ecb_expect_false (mg))
406 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
407 408
408 --enc->depth; 409 --enc->depth;
409} 410}
410 411
… …
453 } 454 }
454 455
455 if (ecb_expect_false (SvREFCNT (sv) > 1) 456 if (ecb_expect_false (SvREFCNT (sv) > 1)
456 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 457 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
457 { 458 {
458 if (!enc->shareable) 459 if (ecb_expect_false (!enc->shareable))
459 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 460 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
460 461
461 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 462 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
462 463
463 if (SvOK (*svp)) 464 if (SvOK (*svp))
… …
477 if (ecb_expect_false (SvOBJECT (sv))) 478 if (ecb_expect_false (SvOBJECT (sv)))
478 { 479 {
479 HV *stash = SvSTASH (sv); 480 HV *stash = SvSTASH (sv);
480 GV *method; 481 GV *method;
481 482
483 if (enc->cbor.flags & F_FORBID_OBJECTS)
484 croak ("encountered object '%s', but forbid_objects is enabled",
485 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
482 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 486 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
483 { 487 {
484 dSP; 488 dSP;
485 489
486 ENTER; SAVETMPS; 490 ENTER; SAVETMPS;
487 PUSHMARK (SP); 491 PUSHMARK (SP);
… …
559 if (ecb_expect_false (nv == (NV)(U32)nv)) 563 if (ecb_expect_false (nv == (NV)(U32)nv))
560 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 564 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
561 //TODO: maybe I32? 565 //TODO: maybe I32?
562 else if (ecb_expect_false (nv == (float)nv)) 566 else if (ecb_expect_false (nv == (float)nv))
563 { 567 {
568 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
569
564 uint32_t fp = ecb_float_to_binary32 (nv); 570 uint32_t fp = ecb_float_to_binary32 (nv);
565
566 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
567 571
568 if (!ecb_big_endian ()) 572 if (!ecb_big_endian ())
569 fp = ecb_bswap32 (fp); 573 fp = ecb_bswap32 (fp);
570 574
571 memcpy (enc->cur, &fp, 4); 575 memcpy (enc->cur, &fp, 4);
572 enc->cur += 4; 576 enc->cur += 4;
573 } 577 }
574 else 578 else
575 { 579 {
580 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
581
576 uint64_t fp = ecb_double_to_binary64 (nv); 582 uint64_t fp = ecb_double_to_binary64 (nv);
577
578 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
579 583
580 if (!ecb_big_endian ()) 584 if (!ecb_big_endian ())
581 fp = ecb_bswap64 (fp); 585 fp = ecb_bswap64 (fp);
582 586
583 memcpy (enc->cur, &fp, 8); 587 memcpy (enc->cur, &fp, 8);
… …
621static SV * 625static SV *
622encode_cbor (SV *scalar, CBOR *cbor) 626encode_cbor (SV *scalar, CBOR *cbor)
623{ 627{
624 enc_t enc = { 0 }; 628 enc_t enc = { 0 };
625 629
626 enc.cbor = *cbor; 630 enc.cbor = *cbor;
627 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 631 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
628 enc.cur = SvPVX (enc.sv); 632 enc.cur = SvPVX (enc.sv);
629 enc.end = SvEND (enc.sv); 633 enc.end = SvEND (enc.sv);
630 634
631 SvPOK_only (enc.sv); 635 SvPOK_only (enc.sv);
632 636
633 if (cbor->flags & F_PACK_STRINGS) 637 if (cbor->flags & F_PACK_STRINGS)
634 { 638 {
… …
694err_unexpected_end (dec_t *dec) 698err_unexpected_end (dec_t *dec)
695{ 699{
696 err_set (dec, "unexpected end of CBOR data"); 700 err_set (dec, "unexpected end of CBOR data");
697} 701}
698 702
699ecb_cold static void
700err_nesting_exceeded (dec_t *dec)
701{
702 err_set (dec, ERR_NESTING_EXCEEDED);
703}
704
705#define ERR_DO(do) SB do; goto fail; SE 703#define ERR_DO(do) SB do; goto fail; SE
706#define ERR(reason) ERR_DO (err_set (dec, reason)) 704#define ERR(reason) ERR_DO (err_set (dec, reason))
707#define ERR_ERRSV ERR_DO (err_errsv (dec)) 705#define ERR_ERRSV ERR_DO (err_errsv (dec))
708 706
709#define WANT(len) if (ecb_expect_false ((UV)(dec->end - dec->cur) < (UV)len)) ERR_DO (err_unexpected_end (dec)) 707#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
710 708
711#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED) 709#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
712#define DEC_DEC_DEPTH --dec->depth 710#define DEC_DEC_DEPTH --dec->depth
713 711
714static UV 712static UV
… …
806 804
807 DEC_DEC_DEPTH; 805 DEC_DEC_DEPTH;
808 return newRV_noinc ((SV *)av); 806 return newRV_noinc ((SV *)av);
809 807
810fail: 808fail:
811 SvREFCNT_dec (av); 809 SvREFCNT_dec_NN (av);
812 DEC_DEC_DEPTH; 810 DEC_DEC_DEPTH;
813 return &PL_sv_undef; 811 return &PL_sv_undef;
814} 812}
815 813
816static void 814static void
… …
879 877
880 return; 878 return;
881 } 879 }
882 880
883 hv_store_ent (hv, k, v, 0); 881 hv_store_ent (hv, k, v, 0);
884 SvREFCNT_dec (k); 882 SvREFCNT_dec_NN (k);
885 883
886fail: 884fail:
887 ; 885 ;
888} 886}
889 887
… …
923 921
924 DEC_DEC_DEPTH; 922 DEC_DEC_DEPTH;
925 return newRV_noinc ((SV *)hv); 923 return newRV_noinc ((SV *)hv);
926 924
927fail: 925fail:
928 SvREFCNT_dec (hv); 926 SvREFCNT_dec_NN (hv);
929 DEC_DEC_DEPTH; 927 DEC_DEC_DEPTH;
930 return &PL_sv_undef; 928 return &PL_sv_undef;
931} 929}
932 930
933static SV * 931static SV *
934decode_str (dec_t *dec, int utf8) 932decode_str (dec_t *dec, int utf8)
935{ 933{
936 SV *sv = 0; 934 SV *sv = 0;
937 935
938 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 936 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
939 { 937 {
940 // indefinite length strings 938 // indefinite length strings
941 ++dec->cur; 939 ++dec->cur;
942 940
943 U8 major = *dec->cur & MAJOR_MISC; 941 U8 major = *dec->cur & MAJOR_MISC;
… …
1011 sv = newRV_noinc (decode_sv (dec)); 1009 sv = newRV_noinc (decode_sv (dec));
1012 break; 1010 break;
1013 1011
1014 case CBOR_TAG_STRINGREF_NAMESPACE: 1012 case CBOR_TAG_STRINGREF_NAMESPACE:
1015 { 1013 {
1016 // do nmot use SAVETMPS/FREETMPS, as these will 1014 // do not use SAVETMPS/FREETMPS, as these will
1017 // erase mortalised caches, e.g. "shareable" 1015 // erase mortalised caches, e.g. "shareable"
1018 ENTER; 1016 ENTER;
1019 1017
1020 SAVESPTR (dec->stringref); 1018 SAVESPTR (dec->stringref);
1021 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1019 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
… …
1081 } 1079 }
1082 break; 1080 break;
1083 1081
1084 case CBOR_TAG_PERL_OBJECT: 1082 case CBOR_TAG_PERL_OBJECT:
1085 { 1083 {
1084 if (dec->cbor.flags & F_FORBID_OBJECTS)
1085 goto filter;
1086
1086 sv = decode_sv (dec); 1087 sv = decode_sv (dec);
1087 1088
1088 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1089 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1089 ERR ("corrupted CBOR data (non-array perl object)"); 1090 ERR ("corrupted CBOR data (non-array perl object)");
1090 1091
… …
1122 { 1123 {
1123 FREETMPS; LEAVE; 1124 FREETMPS; LEAVE;
1124 ERR_ERRSV; 1125 ERR_ERRSV;
1125 } 1126 }
1126 1127
1127 SvREFCNT_dec (sv); 1128 SvREFCNT_dec_NN (sv);
1128 sv = SvREFCNT_inc (POPs); 1129 sv = SvREFCNT_inc (POPs);
1129 1130
1130 PUTBACK; 1131 PUTBACK;
1131 1132
1132 FREETMPS; LEAVE; 1133 FREETMPS; LEAVE;
1133 } 1134 }
1134 break; 1135 break;
1135 1136
1136 default: 1137 default:
1138 filter:
1137 { 1139 {
1138 SV *tag_sv = newSVuv (tag); 1140 SV *tag_sv = newSVuv (tag);
1139 1141
1140 sv = decode_sv (dec); 1142 sv = decode_sv (dec);
1141 1143
… …
1151 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1153 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1152 SPAGAIN; 1154 SPAGAIN;
1153 1155
1154 if (SvTRUE (ERRSV)) 1156 if (SvTRUE (ERRSV))
1155 { 1157 {
1156 SvREFCNT_dec (tag_sv); 1158 SvREFCNT_dec_NN (tag_sv);
1157 FREETMPS; LEAVE; 1159 FREETMPS; LEAVE;
1158 ERR_ERRSV; 1160 ERR_ERRSV;
1159 } 1161 }
1160 1162
1161 if (count) 1163 if (count)
1162 { 1164 {
1163 SvREFCNT_dec (tag_sv); 1165 SvREFCNT_dec_NN (tag_sv);
1164 SvREFCNT_dec (sv); 1166 SvREFCNT_dec_NN (sv);
1165 sv = SvREFCNT_inc (POPs); 1167 sv = SvREFCNT_inc_NN (POPs);
1166 } 1168 }
1167 else 1169 else
1168 { 1170 {
1169 AV *av = newAV (); 1171 AV *av = newAV ();
1170 av_push (av, tag_sv); 1172 av_push (av, tag_sv);
… …
1313 for (i = av_len (dec.shareable) + 1; i--; ) 1315 for (i = av_len (dec.shareable) + 1; i--; )
1314 if ((svp = av_fetch (dec.shareable, i, 0))) 1316 if ((svp = av_fetch (dec.shareable, i, 0)))
1315 sv_setsv (*svp, &PL_sv_undef); 1317 sv_setsv (*svp, &PL_sv_undef);
1316 } 1318 }
1317 1319
1318 SvREFCNT_dec (sv); 1320 SvREFCNT_dec_NN (sv);
1319 1321
1320 if (dec.err_sv) 1322 if (dec.err_sv)
1321 sv_2mortal (dec.err_sv); 1323 sv_2mortal (dec.err_sv);
1322 1324
1323 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1325 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
… …
1502 ALIAS: 1504 ALIAS:
1503 shrink = F_SHRINK 1505 shrink = F_SHRINK
1504 allow_unknown = F_ALLOW_UNKNOWN 1506 allow_unknown = F_ALLOW_UNKNOWN
1505 allow_sharing = F_ALLOW_SHARING 1507 allow_sharing = F_ALLOW_SHARING
1506 allow_cycles = F_ALLOW_CYCLES 1508 allow_cycles = F_ALLOW_CYCLES
1509 forbid_objects = F_FORBID_OBJECTS
1507 pack_strings = F_PACK_STRINGS 1510 pack_strings = F_PACK_STRINGS
1508 text_keys = F_TEXT_KEYS 1511 text_keys = F_TEXT_KEYS
1509 text_strings = F_TEXT_STRINGS 1512 text_strings = F_TEXT_STRINGS
1510 validate_utf8 = F_VALIDATE_UTF8 1513 validate_utf8 = F_VALIDATE_UTF8
1511 PPCODE: 1514 PPCODE:
… …
1522 ALIAS: 1525 ALIAS:
1523 get_shrink = F_SHRINK 1526 get_shrink = F_SHRINK
1524 get_allow_unknown = F_ALLOW_UNKNOWN 1527 get_allow_unknown = F_ALLOW_UNKNOWN
1525 get_allow_sharing = F_ALLOW_SHARING 1528 get_allow_sharing = F_ALLOW_SHARING
1526 get_allow_cycles = F_ALLOW_CYCLES 1529 get_allow_cycles = F_ALLOW_CYCLES
1530 get_forbid_objects = F_FORBID_OBJECTS
1527 get_pack_strings = F_PACK_STRINGS 1531 get_pack_strings = F_PACK_STRINGS
1528 get_text_keys = F_TEXT_KEYS 1532 get_text_keys = F_TEXT_KEYS
1529 get_text_strings = F_TEXT_STRINGS 1533 get_text_strings = F_TEXT_STRINGS
1530 get_validate_utf8 = F_VALIDATE_UTF8 1534 get_validate_utf8 = F_VALIDATE_UTF8
1531 PPCODE: 1535 PPCODE:

Diff Legend

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