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.7 by root, Sat Oct 26 23:02:55 2013 UTC vs.
Revision 1.80 by root, Fri Sep 8 20:03:06 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
13#define ECB_NO_THREADS 1
12#include "ecb.h" 14#include "ecb.h"
13 15
16// compatibility with perl <5.18
17#ifndef HvNAMELEN_get
18# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
19#endif
20#ifndef HvNAMELEN
21# define HvNAMELEN(hv) HvNAMELEN_get (hv)
22#endif
23#ifndef HvNAMEUTF8
24# define HvNAMEUTF8(hv) 0
25#endif
26#ifndef SvREFCNT_inc_NN
27# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
28#endif
29#ifndef SvREFCNT_dec_NN
30# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
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)))
35
36// known major and minor types
37enum cbor_type
38{
39 MAJOR_SHIFT = 5,
40 MINOR_MASK = 0x1f,
41
42 MAJOR_POS_INT = 0 << MAJOR_SHIFT,
43 MAJOR_NEG_INT = 1 << MAJOR_SHIFT,
44 MAJOR_BYTES = 2 << MAJOR_SHIFT,
45 MAJOR_TEXT = 3 << MAJOR_SHIFT,
46 MAJOR_ARRAY = 4 << MAJOR_SHIFT,
47 MAJOR_MAP = 5 << MAJOR_SHIFT,
48 MAJOR_TAG = 6 << MAJOR_SHIFT,
49 MAJOR_MISC = 7 << MAJOR_SHIFT,
50
51 // INT/STRING/ARRAY/MAP subtypes
52 LENGTH_EXT1 = 24,
53 LENGTH_EXT2 = 25,
54 LENGTH_EXT4 = 26,
55 LENGTH_EXT8 = 27,
56
57 // SIMPLE types (effectively MISC subtypes)
58 SIMPLE_FALSE = 20,
59 SIMPLE_TRUE = 21,
60 SIMPLE_NULL = 22,
61 SIMPLE_UNDEF = 23,
62
63 // MISC subtype (unused)
64 MISC_EXT1 = 24,
65 MISC_FLOAT16 = 25,
66 MISC_FLOAT32 = 26,
67 MISC_FLOAT64 = 27,
68
69 // BYTES/TEXT/ARRAY/MAP
70 MINOR_INDEF = 31,
71};
72
73// known tags
74enum cbor_tag
75{
76 // extensions
77 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
78 CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
79 CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
80 CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
81 CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
82 CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
83 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
84
85 // rfc7049
86 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
87 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
88 CBOR_TAG_POS_BIGNUM = 2, // byte string
89 CBOR_TAG_NEG_BIGNUM = 3, // byte string
90 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
91 CBOR_TAG_BIGFLOAT = 5, // array
92
93 CBOR_TAG_CONV_B64U = 21, // base64url, any
94 CBOR_TAG_CONV_B64 = 22, // base64, any
95 CBOR_TAG_CONV_HEX = 23, // base16, any
96 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
97
98 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
99 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
100 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
101 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
102 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
103
104 CBOR_TAG_MAGIC = 55799, // self-describe cbor
105};
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
14#define F_SHRINK 0x00000200UL 121#define F_SHRINK 0x00000001UL
15#define F_ALLOW_UNKNOWN 0x00002000UL 122#define F_ALLOW_UNKNOWN 0x00000002UL
123#define F_ALLOW_SHARING 0x00000004UL
124#define F_ALLOW_CYCLES 0x00000008UL
125#define F_ALLOW_WEAK_CYCLES 0x00000010UL
126#define F_FORBID_OBJECTS 0x00000020UL
127#define F_PACK_STRINGS 0x00000040UL
128#define F_TEXT_KEYS 0x00000080UL
129#define F_TEXT_STRINGS 0x00000100UL
130#define F_VALIDATE_UTF8 0x00000200UL
16 131
17#define INIT_SIZE 32 // initial scalar size to be allocated 132#define INIT_SIZE 32 // initial scalar size to be allocated
18 133
19#define SB do { 134#define SB do {
20#define SE } while (0) 135#define SE } while (0)
31#else 146#else
32# define CBOR_SLOW 0 147# define CBOR_SLOW 0
33# define CBOR_STASH cbor_stash 148# define CBOR_STASH cbor_stash
34#endif 149#endif
35 150
36static HV *cbor_stash, *cbor_boolean_stash, *cbor_tagged_stash; // CBOR::XS:: 151static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
37static SV *cbor_true, *cbor_false; 152static SV *types_true, *types_false, *types_error, *sv_cbor, *default_filter;
38 153
39typedef struct { 154typedef struct {
40 U32 flags; 155 U32 flags;
41 U32 max_depth; 156 U32 max_depth;
42 STRLEN max_size; 157 STRLEN max_size;
158 SV *filter;
159
160 // for the incremental parser
161 STRLEN incr_pos; // the current offset into the text
162 STRLEN incr_need; // minimum bytes needed to decode
163 AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
43} CBOR; 164} CBOR;
44 165
45ecb_inline void 166ecb_inline void
46cbor_init (CBOR *cbor) 167cbor_init (CBOR *cbor)
47{ 168{
48 Zero (cbor, 1, CBOR); 169 Zero (cbor, 1, CBOR);
49 cbor->max_depth = 512; 170 cbor->max_depth = 512;
171}
172
173ecb_inline void
174cbor_free (CBOR *cbor)
175{
176 SvREFCNT_dec (cbor->filter);
177 SvREFCNT_dec (cbor->incr_count);
50} 178}
51 179
52///////////////////////////////////////////////////////////////////////////// 180/////////////////////////////////////////////////////////////////////////////
53// utility functions 181// utility functions
54 182
76 SvPV_renew (sv, SvCUR (sv) + 1); 204 SvPV_renew (sv, SvCUR (sv) + 1);
77#endif 205#endif
78 } 206 }
79} 207}
80 208
81///////////////////////////////////////////////////////////////////////////// 209// minimum length of a string to be registered for stringref
82// fp hell 210ecb_inline STRLEN
83 211minimum_string_length (UV idx)
84//TODO 212{
213 return idx <= 23 ? 3
214 : idx <= 0xffU ? 4
215 : idx <= 0xffffU ? 5
216 : idx <= 0xffffffffU ? 7
217 : 11;
218}
85 219
86///////////////////////////////////////////////////////////////////////////// 220/////////////////////////////////////////////////////////////////////////////
87// encoder 221// encoder
88 222
89// structure used for encoding CBOR 223// structure used for encoding CBOR
92 char *cur; // SvPVX (sv) + current output position 226 char *cur; // SvPVX (sv) + current output position
93 char *end; // SvEND (sv) 227 char *end; // SvEND (sv)
94 SV *sv; // result scalar 228 SV *sv; // result scalar
95 CBOR cbor; 229 CBOR cbor;
96 U32 depth; // recursion level 230 U32 depth; // recursion level
231 HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
232 UV stringref_idx;
233 HV *shareable; // ptr => index, or 0
234 UV shareable_idx;
97} enc_t; 235} enc_t;
98 236
99ecb_inline void 237ecb_inline void
100need (enc_t *enc, STRLEN len) 238need (enc_t *enc, STRLEN len)
101{ 239{
102 if (ecb_expect_false (enc->cur + len >= enc->end)) 240 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
103 { 241 {
104 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 242 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
105 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 243 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
106 enc->cur = SvPVX (enc->sv) + cur; 244 enc->cur = SvPVX (enc->sv) + cur;
107 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 245 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
108 } 246 }
109} 247}
110 248
249static void encode_sv (enc_t *enc, SV *sv);
250
111ecb_inline void 251ecb_inline void
112encode_ch (enc_t *enc, char ch) 252encode_ch (enc_t *enc, char ch)
113{ 253{
114 need (enc, 1); 254 need (enc, 1);
115 *enc->cur++ = ch; 255 *enc->cur++ = ch;
116} 256}
117 257
258// used for tags, intregers, element counts and so on
118static void 259static void
119encode_uint (enc_t *enc, int major, UV len) 260encode_uint (enc_t *enc, int major, UV len)
120{ 261{
121 need (enc, 9); 262 need (enc, 9);
122 263
123 if (len < 24) 264 if (ecb_expect_true (len < LENGTH_EXT1))
124 *enc->cur++ = major | len; 265 *enc->cur++ = major | len;
125 else if (len <= 0xff) 266 else if (ecb_expect_true (len <= 0xffU))
126 { 267 {
127 *enc->cur++ = major | 24; 268 *enc->cur++ = major | LENGTH_EXT1;
128 *enc->cur++ = len; 269 *enc->cur++ = len;
129 } 270 }
130 else if (len <= 0xffff) 271 else if (len <= 0xffffU)
131 { 272 {
132 *enc->cur++ = major | 25; 273 *enc->cur++ = major | LENGTH_EXT2;
133 *enc->cur++ = len >> 8; 274 *enc->cur++ = len >> 8;
134 *enc->cur++ = len; 275 *enc->cur++ = len;
135 } 276 }
136 else if (len <= 0xffffffff) 277 else if (len <= 0xffffffffU)
137 { 278 {
138 *enc->cur++ = major | 26; 279 *enc->cur++ = major | LENGTH_EXT4;
139 *enc->cur++ = len >> 24; 280 *enc->cur++ = len >> 24;
140 *enc->cur++ = len >> 16; 281 *enc->cur++ = len >> 16;
141 *enc->cur++ = len >> 8; 282 *enc->cur++ = len >> 8;
142 *enc->cur++ = len; 283 *enc->cur++ = len;
143 } 284 }
144 else 285 else
145 { 286 {
146 *enc->cur++ = major | 27; 287 *enc->cur++ = major | LENGTH_EXT8;
147 *enc->cur++ = len >> 56; 288 *enc->cur++ = len >> 56;
148 *enc->cur++ = len >> 48; 289 *enc->cur++ = len >> 48;
149 *enc->cur++ = len >> 40; 290 *enc->cur++ = len >> 40;
150 *enc->cur++ = len >> 32; 291 *enc->cur++ = len >> 32;
151 *enc->cur++ = len >> 24; 292 *enc->cur++ = len >> 24;
153 *enc->cur++ = len >> 8; 294 *enc->cur++ = len >> 8;
154 *enc->cur++ = len; 295 *enc->cur++ = len;
155 } 296 }
156} 297}
157 298
158static void 299// encodes a perl value into a CBOR integer
300ecb_inline void
301encode_int (enc_t *enc, SV *sv)
302{
303 if (SvIsUV (sv))
304 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
305 else if (SvIVX (sv) >= 0)
306 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
307 else
308 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
309}
310
311ecb_inline void
312encode_tag (enc_t *enc, UV tag)
313{
314 encode_uint (enc, MAJOR_TAG, tag);
315}
316
317// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
318ecb_noinline static void
159encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 319encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
160{ 320{
161 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 321 STRLEN ulen = len;
322 U8 *p, *pend = (U8 *)str + len;
323
324 for (p = (U8 *)str; p < pend; ++p)
325 ulen += *p >> 7; // count set high bits
326
327 encode_uint (enc, MAJOR_TEXT, ulen);
328
329 need (enc, ulen);
330 for (p = (U8 *)str; p < pend; ++p)
331 if (*p < 0x80)
332 *enc->cur++ = *p;
333 else
334 {
335 *enc->cur++ = 0xc0 + (*p >> 6);
336 *enc->cur++ = 0x80 + (*p & 63);
337 }
338}
339
340ecb_inline void
341encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
342{
343 if (ecb_expect_false (upgrade_utf8))
344 if (!utf8)
345 {
346 encode_str_utf8 (enc, utf8, str, len);
347 return;
348 }
349
350 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
162 need (enc, len); 351 need (enc, len);
163 memcpy (enc->cur, str, len); 352 memcpy (enc->cur, str, len);
164 enc->cur += len; 353 enc->cur += len;
165} 354}
166 355
167static void encode_sv (enc_t *enc, SV *sv); 356ecb_inline void
357encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
358{
359 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
360 {
361 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
362
363 if (SvOK (*svp))
364 {
365 // already registered, use stringref
366 encode_tag (enc, CBOR_TAG_STRINGREF);
367 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
368 return;
369 }
370 else if (len >= minimum_string_length (enc->stringref_idx))
371 {
372 // register only
373 sv_setuv (*svp, enc->stringref_idx);
374 ++enc->stringref_idx;
375 }
376 }
377
378 encode_str (enc, upgrade_utf8, utf8, str, len);
379}
380
381ecb_inline void
382encode_float16 (enc_t *enc, NV nv)
383{
384 need (enc, 1+2);
385
386 *enc->cur++ = MAJOR_MISC | MISC_FLOAT16;
387
388 uint16_t fp = ecb_float_to_binary16 (nv);
389
390 if (!ecb_big_endian ())
391 fp = ecb_bswap16 (fp);
392
393 memcpy (enc->cur, &fp, 2);
394 enc->cur += 2;
395}
396
397ecb_inline void
398encode_float32 (enc_t *enc, NV nv)
399{
400 need (enc, 1+4);
401
402 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
403
404 uint32_t fp = ecb_float_to_binary32 (nv);
405
406 if (!ecb_big_endian ())
407 fp = ecb_bswap32 (fp);
408
409 memcpy (enc->cur, &fp, 4);
410 enc->cur += 4;
411}
412
413ecb_inline void
414encode_float64 (enc_t *enc, NV nv)
415{
416 need (enc, 1+8);
417
418 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
419
420 uint64_t fp = ecb_double_to_binary64 (nv);
421
422 if (!ecb_big_endian ())
423 fp = ecb_bswap64 (fp);
424
425 memcpy (enc->cur, &fp, 8);
426 enc->cur += 8;
427}
428
429ecb_inline void
430encode_bool (enc_t *enc, int istrue)
431{
432 encode_ch (enc, istrue ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
433}
434
435// encodes an arrayref containing key-value pairs as CBOR map
436ecb_inline void
437encode_array_as_map (enc_t *enc, SV *sv)
438{
439 if (enc->depth >= enc->cbor.max_depth)
440 croak (ERR_NESTING_EXCEEDED);
441
442 ++enc->depth;
443
444 // as_map does error checking for us, but we re-check in case
445 // things have changed.
446
447 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
448 croak ("CBOR::XS::as_map requires an array reference (did you change the array after calling as_map?)");
449
450 AV *av = (AV *)SvRV (sv);
451 int i, len = av_len (av);
452
453 if (!(len & 1))
454 croak ("CBOR::XS::as_map requires an even number of elements (did you change the array after calling as_map?)");
455
456 encode_uint (enc, MAJOR_MAP, (len + 1) >> 1);
457
458 for (i = 0; i <= len; ++i)
459 {
460 SV **svp = av_fetch (av, i, 0);
461 encode_sv (enc, svp ? *svp : &PL_sv_undef);
462 }
463
464 --enc->depth;
465}
466
467ecb_inline void
468encode_forced (enc_t *enc, UV type, SV *sv)
469{
470 switch (type)
471 {
472 case AS_CBOR:
473 {
474 STRLEN len;
475 char *str = SvPVbyte (sv, len);
476
477 need (enc, len);
478 memcpy (enc->cur, str, len);
479 enc->cur += len;
480 }
481 break;
482
483 case AS_BYTES:
484 {
485 STRLEN len;
486 char *str = SvPVbyte (sv, len);
487 encode_strref (enc, 0, 0, str, len);
488 }
489 break;
490
491 case AS_TEXT:
492 {
493 STRLEN len;
494 char *str = SvPVutf8 (sv, len);
495 encode_strref (enc, 1, 1, str, len);
496 }
497 break;
498
499 case AS_INT: encode_int (enc, sv); break;
500
501 case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break;
502 case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break;
503 case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break;
504
505 case AS_MAP: encode_array_as_map (enc, sv); break;
506
507 default:
508 croak ("encountered malformed CBOR::XS::Tagged object");
509 }
510}
168 511
169static void 512static void
170encode_av (enc_t *enc, AV *av) 513encode_av (enc_t *enc, AV *av)
171{ 514{
172 int i, len = av_len (av); 515 int i, len = av_len (av);
174 if (enc->depth >= enc->cbor.max_depth) 517 if (enc->depth >= enc->cbor.max_depth)
175 croak (ERR_NESTING_EXCEEDED); 518 croak (ERR_NESTING_EXCEEDED);
176 519
177 ++enc->depth; 520 ++enc->depth;
178 521
179 encode_uint (enc, 0x80, len + 1); 522 encode_uint (enc, MAJOR_ARRAY, len + 1);
180 523
524 if (ecb_expect_false (SvMAGICAL (av)))
181 for (i = 0; i <= len; ++i) 525 for (i = 0; i <= len; ++i)
182 { 526 {
183 SV **svp = av_fetch (av, i, 0); 527 SV **svp = av_fetch (av, i, 0);
184 encode_sv (enc, svp ? *svp : &PL_sv_undef); 528 encode_sv (enc, svp ? *svp : &PL_sv_undef);
185 } 529 }
530 else
531 for (i = 0; i <= len; ++i)
532 {
533 SV *sv = AvARRAY (av)[i];
534 encode_sv (enc, sv ? sv : &PL_sv_undef);
535 }
186 536
187 --enc->depth; 537 --enc->depth;
188} 538}
189 539
190static void 540static void
198 ++enc->depth; 548 ++enc->depth;
199 549
200 int pairs = hv_iterinit (hv); 550 int pairs = hv_iterinit (hv);
201 int mg = SvMAGICAL (hv); 551 int mg = SvMAGICAL (hv);
202 552
203 if (mg) 553 if (ecb_expect_false (mg))
204 encode_ch (enc, 0xa0 | 31); 554 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
205 else 555 else
206 encode_uint (enc, 0xa0, pairs); 556 encode_uint (enc, MAJOR_MAP, pairs);
207 557
208 while ((he = hv_iternext (hv))) 558 while ((he = hv_iternext (hv)))
209 { 559 {
210 if (HeKLEN (he) == HEf_SVKEY) 560 if (HeKLEN (he) == HEf_SVKEY)
211 encode_sv (enc, HeSVKEY (he)); 561 encode_sv (enc, HeSVKEY (he));
212 else 562 else
213 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 563 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
214 564
215 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 565 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
216 } 566 }
217 567
218 if (mg) 568 if (ecb_expect_false (mg))
219 encode_ch (enc, 0xe0 | 31); 569 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
220 570
221 --enc->depth; 571 --enc->depth;
222} 572}
223 573
224// encode objects, arrays and special \0=false and \1=true values. 574// encode objects, arrays and special \0=false and \1=true values.
225static void 575static void
226encode_rv (enc_t *enc, SV *sv) 576encode_rv (enc_t *enc, SV *sv)
227{ 577{
228 svtype svt;
229
230 SvGETMAGIC (sv); 578 SvGETMAGIC (sv);
579
231 svt = SvTYPE (sv); 580 svtype svt = SvTYPE (sv);
232 581
233 if (ecb_expect_false (SvOBJECT (sv))) 582 if (ecb_expect_false (SvOBJECT (sv)))
234 { 583 {
235 HV *boolean_stash = !CBOR_SLOW || cbor_boolean_stash 584 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
236 ? cbor_boolean_stash 585 ? types_boolean_stash
237 : gv_stashpv ("CBOR::XS::Boolean", 1); 586 : gv_stashpv ("Types::Serialiser::Boolean", 1);
587 HV *error_stash = !CBOR_SLOW || types_error_stash
588 ? types_error_stash
589 : gv_stashpv ("Types::Serialiser::Error", 1);
238 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 590 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
239 ? cbor_tagged_stash 591 ? cbor_tagged_stash
240 : gv_stashpv ("CBOR::XS::Tagged" , 1); 592 : gv_stashpv ("CBOR::XS::Tagged" , 1);
241 593
594 HV *stash = SvSTASH (sv);
595
242 if (SvSTASH (sv) == boolean_stash) 596 if (stash == boolean_stash)
243 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 597 {
598 encode_bool (enc, SvIV (sv));
599 return;
600 }
601 else if (stash == error_stash)
602 {
603 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
604 return;
605 }
244 else if (SvSTASH (sv) == tagged_stash) 606 else if (stash == tagged_stash)
245 { 607 {
246 if (svt != SVt_PVAV) 608 if (svt != SVt_PVAV)
247 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 609 croak ("encountered CBOR::XS::Tagged object that isn't an array");
248 610
611 switch (av_len ((AV *)sv))
612 {
613 case 2-1:
614 // actually a tagged value
249 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 615 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
250 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 616 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
617 break;
618
619 case 3-1:
620 // a forced type [value, type, undef]
621 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
622 break;
623
624 default:
625 croak ("encountered malformed CBOR::XS::Tagged object");
626 }
627
628 return;
629 }
630 }
631
632 if (ecb_expect_false (SvREFCNT (sv) > 1)
633 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
634 {
635 if (ecb_expect_false (!enc->shareable))
636 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
637
638 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
639
640 if (SvOK (*svp))
641 {
642 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
643 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
644 return;
251 } 645 }
252 else 646 else
253 { 647 {
648 sv_setuv (*svp, enc->shareable_idx);
649 ++enc->shareable_idx;
650 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
651 }
652 }
653
654 if (ecb_expect_false (SvOBJECT (sv)))
655 {
656 HV *stash = SvSTASH (sv);
657 GV *method;
658
659 if (enc->cbor.flags & F_FORBID_OBJECTS)
660 croak ("encountered object '%s', but forbid_objects is enabled",
661 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
662 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
663 {
664 dSP;
665
666 ENTER; SAVETMPS;
667 PUSHMARK (SP);
254 // we re-bless the reference to get overload and other niceties right 668 // we re-bless the reference to get overload and other niceties right
255 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
256
257 if (to_cbor)
258 {
259 dSP;
260
261 ENTER; SAVETMPS; PUSHMARK (SP);
262 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 669 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
263 670
264 // calling with G_SCALAR ensures that we always get a 1 return value
265 PUTBACK; 671 PUTBACK;
672 // G_SCALAR ensures that return value is 1
266 call_sv ((SV *)GvCV (to_cbor), G_SCALAR); 673 call_sv ((SV *)GvCV (method), G_SCALAR);
267 SPAGAIN; 674 SPAGAIN;
268 675
269 // catch this surprisingly common error 676 // catch this surprisingly common error
270 if (SvROK (TOPs) && SvRV (TOPs) == sv) 677 if (SvROK (TOPs) && SvRV (TOPs) == sv)
271 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv))); 678 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
272 679
273 sv = POPs; 680 encode_sv (enc, POPs);
681
274 PUTBACK; 682 PUTBACK;
275 683
276 encode_sv (enc, sv);
277
278 FREETMPS; LEAVE; 684 FREETMPS; LEAVE;
685 }
686 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
687 {
688 dSP;
689
690 ENTER; SAVETMPS;
691 PUSHMARK (SP);
692 EXTEND (SP, 2);
693 // we re-bless the reference to get overload and other niceties right
694 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
695 PUSHs (sv_cbor);
696
697 PUTBACK;
698 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
699 SPAGAIN;
700
701 // catch this surprisingly common error
702 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
703 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
704
705 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
706 encode_uint (enc, MAJOR_ARRAY, count + 1);
707 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
708
709 {
710 int i;
711
712 for (i = 0; i < count; ++i)
713 encode_sv (enc, SP[i + 1 - count]);
714
715 SP -= count;
279 } 716 }
717
718 PUTBACK;
719
720 FREETMPS; LEAVE;
721 }
280 else 722 else
281 croak ("encountered object '%s', but no TO_CBOR method available on it", 723 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
282 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 724 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
283 }
284 } 725 }
285 else if (svt == SVt_PVHV) 726 else if (svt == SVt_PVHV)
286 encode_hv (enc, (HV *)sv); 727 encode_hv (enc, (HV *)sv);
287 else if (svt == SVt_PVAV) 728 else if (svt == SVt_PVAV)
288 encode_av (enc, (AV *)sv); 729 encode_av (enc, (AV *)sv);
289 else if (svt < SVt_PVAV)
290 {
291 STRLEN len = 0;
292 char *pv = svt ? SvPV (sv, len) : 0;
293
294 if (len == 1 && *pv == '1')
295 encode_ch (enc, 0xe0 | 21);
296 else if (len == 1 && *pv == '0')
297 encode_ch (enc, 0xe0 | 20);
298 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
299 encode_ch (enc, 0xe0 | 23);
300 else
301 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
302 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
303 }
304 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
305 encode_ch (enc, 0xe0 | 23);
306 else 730 else
307 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 731 {
308 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 732 encode_tag (enc, CBOR_TAG_INDIRECTION);
733 encode_sv (enc, sv);
734 }
309} 735}
310 736
311static void 737static void
312encode_nv (enc_t *enc, SV *sv) 738encode_nv (enc_t *enc, SV *sv)
313{ 739{
314 double nv = SvNVX (sv); 740 double nv = SvNVX (sv);
315 741
316 need (enc, 9); 742 need (enc, 9);
317 743
318 if (ecb_expect_false (nv == (U32)nv)) 744 if (ecb_expect_false (nv == (NV)(U32)nv))
319 encode_uint (enc, 0x00, (U32)nv); 745 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
320 //TODO: maybe I32? 746 //TODO: maybe I32?
321 else if (ecb_expect_false (nv == (float)nv)) 747 else if (ecb_expect_false (nv == (float)nv))
322 { 748 encode_float32 (enc, nv);
323 uint32_t fp = ecb_float_to_binary32 (nv);
324
325 *enc->cur++ = 0xe0 | 26;
326
327 if (!ecb_big_endian ())
328 fp = ecb_bswap32 (fp);
329
330 memcpy (enc->cur, &fp, 4);
331 enc->cur += 4;
332 }
333 else 749 else
334 { 750 encode_float64 (enc, nv);
335 uint64_t fp = ecb_double_to_binary64 (nv);
336
337 *enc->cur++ = 0xe0 | 27;
338
339 if (!ecb_big_endian ())
340 fp = ecb_bswap64 (fp);
341
342 memcpy (enc->cur, &fp, 8);
343 enc->cur += 8;
344 }
345} 751}
346 752
347static void 753static void
348encode_sv (enc_t *enc, SV *sv) 754encode_sv (enc_t *enc, SV *sv)
349{ 755{
351 757
352 if (SvPOKp (sv)) 758 if (SvPOKp (sv))
353 { 759 {
354 STRLEN len; 760 STRLEN len;
355 char *str = SvPV (sv, len); 761 char *str = SvPV (sv, len);
356 encode_str (enc, SvUTF8 (sv), str, len); 762 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
357 } 763 }
358 else if (SvNOKp (sv)) 764 else if (SvNOKp (sv))
359 encode_nv (enc, sv); 765 encode_nv (enc, sv);
360 else if (SvIOKp (sv)) 766 else if (SvIOKp (sv))
361 { 767 encode_int (enc, sv);
362 if (SvIsUV (sv))
363 encode_uint (enc, 0x00, SvUVX (sv));
364 else if (SvIVX (sv) >= 0)
365 encode_uint (enc, 0x00, SvIVX (sv));
366 else
367 encode_uint (enc, 0x20, -(SvIVX (sv) + 1));
368 }
369 else if (SvROK (sv)) 768 else if (SvROK (sv))
370 encode_rv (enc, SvRV (sv)); 769 encode_rv (enc, SvRV (sv));
371 else if (!SvOK (sv)) 770 else if (!SvOK (sv))
372 encode_ch (enc, 0xe0 | 22); 771 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
373 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 772 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
374 encode_ch (enc, 0xe0 | 23); 773 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
375 else 774 else
376 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data", 775 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
377 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 776 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
378} 777}
379 778
380static SV * 779static SV *
381encode_cbor (SV *scalar, CBOR *cbor) 780encode_cbor (SV *scalar, CBOR *cbor)
382{ 781{
383 enc_t enc; 782 enc_t enc = { 0 };
384 783
385 enc.cbor = *cbor; 784 enc.cbor = *cbor;
386 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 785 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
387 enc.cur = SvPVX (enc.sv); 786 enc.cur = SvPVX (enc.sv);
388 enc.end = SvEND (enc.sv); 787 enc.end = SvEND (enc.sv);
389 enc.depth = 0;
390 788
391 SvPOK_only (enc.sv); 789 SvPOK_only (enc.sv);
790
791 if (cbor->flags & F_PACK_STRINGS)
792 {
793 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
794 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
795 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
796 }
797
392 encode_sv (&enc, scalar); 798 encode_sv (&enc, scalar);
393 799
394 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 800 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
395 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 801 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
396 802
410 U8 *end; // end of input string 816 U8 *end; // end of input string
411 const char *err; // parse error, if != 0 817 const char *err; // parse error, if != 0
412 CBOR cbor; 818 CBOR cbor;
413 U32 depth; // recursion depth 819 U32 depth; // recursion depth
414 U32 maxdepth; // recursion depth limit 820 U32 maxdepth; // recursion depth limit
821 AV *shareable;
822 AV *stringref;
823 SV *decode_tagged;
824 SV *err_sv; // optional sv for error, needs to be freed
415} dec_t; 825} dec_t;
416 826
417#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 827// set dec->err to ERRSV
828ecb_cold static void
829err_errsv (dec_t *dec)
830{
831 if (!dec->err)
832 {
833 dec->err_sv = newSVsv (ERRSV);
418 834
419#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 835 // chop off the trailing \n
836 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
837 *SvEND (dec->err_sv) = 0;
420 838
839 dec->err = SvPVutf8_nolen (dec->err_sv);
840 }
841}
842
843// the following functions are used to reduce code size and help the compiler to optimise
844ecb_cold static void
845err_set (dec_t *dec, const char *reason)
846{
847 if (!dec->err)
848 dec->err = reason;
849}
850
851ecb_cold static void
852err_unexpected_end (dec_t *dec)
853{
854 err_set (dec, "unexpected end of CBOR data");
855}
856
857#define ERR_DO(do) SB do; goto fail; SE
858#define ERR(reason) ERR_DO (err_set (dec, reason))
859#define ERR_ERRSV ERR_DO (err_errsv (dec))
860
861#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
862
421#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 863#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
422#define DEC_DEC_DEPTH --dec->depth 864#define DEC_DEC_DEPTH --dec->depth
423 865
424static UV 866static UV
425decode_uint (dec_t *dec) 867decode_uint (dec_t *dec)
426{ 868{
427 switch (*dec->cur & 31) 869 U8 m = *dec->cur & MINOR_MASK;
428 { 870 ++dec->cur;
429 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
430 case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
431 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
432 return *dec->cur++ & 31;
433 871
434 case 24: 872 if (ecb_expect_true (m < LENGTH_EXT1))
873 return m;
874 else if (ecb_expect_true (m == LENGTH_EXT1))
875 {
435 WANT (2); 876 WANT (1);
436 dec->cur += 2; 877 dec->cur += 1;
437 return dec->cur[-1]; 878 return dec->cur[-1];
438 879 }
439 case 25: 880 else if (ecb_expect_true (m == LENGTH_EXT2))
881 {
440 WANT (3); 882 WANT (2);
441 dec->cur += 3; 883 dec->cur += 2;
442 return (((UV)dec->cur[-2]) << 8) 884 return (((UV)dec->cur[-2]) << 8)
443 | ((UV)dec->cur[-1]); 885 | ((UV)dec->cur[-1]);
444 886 }
445 case 26: 887 else if (ecb_expect_true (m == LENGTH_EXT4))
888 {
446 WANT (5); 889 WANT (4);
447 dec->cur += 5; 890 dec->cur += 4;
448 return (((UV)dec->cur[-4]) << 24) 891 return (((UV)dec->cur[-4]) << 24)
449 | (((UV)dec->cur[-3]) << 16) 892 | (((UV)dec->cur[-3]) << 16)
450 | (((UV)dec->cur[-2]) << 8) 893 | (((UV)dec->cur[-2]) << 8)
451 | ((UV)dec->cur[-1]); 894 | ((UV)dec->cur[-1]);
452 895 }
453 case 27: 896 else if (ecb_expect_true (m == LENGTH_EXT8))
897 {
454 WANT (9); 898 WANT (8);
455 dec->cur += 9; 899 dec->cur += 8;
900
901 return
902#if UVSIZE < 8
903 0
904#else
456 return (((UV)dec->cur[-8]) << 56) 905 (((UV)dec->cur[-8]) << 56)
457 | (((UV)dec->cur[-7]) << 48) 906 | (((UV)dec->cur[-7]) << 48)
458 | (((UV)dec->cur[-6]) << 40) 907 | (((UV)dec->cur[-6]) << 40)
459 | (((UV)dec->cur[-5]) << 32) 908 | (((UV)dec->cur[-5]) << 32)
909#endif
460 | (((UV)dec->cur[-4]) << 24) 910 | (((UV)dec->cur[-4]) << 24)
461 | (((UV)dec->cur[-3]) << 16) 911 | (((UV)dec->cur[-3]) << 16)
462 | (((UV)dec->cur[-2]) << 8) 912 | (((UV)dec->cur[-2]) << 8)
463 | ((UV)dec->cur[-1]); 913 | ((UV)dec->cur[-1]);
464 914 }
465 default: 915 else
466 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 916 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
467 }
468 917
469fail: 918fail:
470 return 0; 919 return 0;
471} 920}
472 921
477{ 926{
478 AV *av = newAV (); 927 AV *av = newAV ();
479 928
480 DEC_INC_DEPTH; 929 DEC_INC_DEPTH;
481 930
482 if ((*dec->cur & 31) == 31) 931 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
483 { 932 {
484 ++dec->cur; 933 ++dec->cur;
485 934
486 for (;;) 935 for (;;)
487 { 936 {
488 WANT (1); 937 WANT (1);
489 938
490 if (*dec->cur == (0xe0 | 31)) 939 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
491 { 940 {
492 ++dec->cur; 941 ++dec->cur;
493 break; 942 break;
494 } 943 }
495 944
496 av_push (av, decode_sv (dec)); 945 av_push (av, decode_sv (dec));
497 } 946 }
498 } 947 }
499 else 948 else
500 { 949 {
501 int i, len = decode_uint (dec); 950 UV i, len = decode_uint (dec);
502 951
952 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
503 av_fill (av, len - 1); 953 av_fill (av, len - 1);
504 954
505 for (i = 0; i < len; ++i) 955 for (i = 0; i < len; ++i)
506 AvARRAY (av)[i] = decode_sv (dec); 956 AvARRAY (av)[i] = decode_sv (dec);
507 } 957 }
508 958
509 DEC_DEC_DEPTH; 959 DEC_DEC_DEPTH;
510 return newRV_noinc ((SV *)av); 960 return newRV_noinc ((SV *)av);
511 961
512fail: 962fail:
513 SvREFCNT_dec (av); 963 SvREFCNT_dec_NN (av);
514 DEC_DEC_DEPTH; 964 DEC_DEC_DEPTH;
515 return &PL_sv_undef; 965 return &PL_sv_undef;
516} 966}
517 967
968static void
969decode_he (dec_t *dec, HV *hv)
970{
971 // for speed reasons, we specialcase single-string
972 // byte or utf-8 strings as keys, but only when !stringref
973
974 if (ecb_expect_true (!dec->stringref))
975 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
976 {
977 STRLEN len = decode_uint (dec);
978 char *key = (char *)dec->cur;
979
980 WANT (len);
981 dec->cur += len;
982
983 hv_store (hv, key, len, decode_sv (dec), 0);
984
985 return;
986 }
987 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
988 {
989 STRLEN len = decode_uint (dec);
990 char *key = (char *)dec->cur;
991
992 WANT (len);
993 dec->cur += len;
994
995 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
996 if (!cbor_is_utf8_string ((U8 *)key, len))
997 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
998
999 hv_store (hv, key, -len, decode_sv (dec), 0);
1000
1001 return;
1002 }
1003
1004 SV *k = decode_sv (dec);
1005 SV *v = decode_sv (dec);
1006
1007 // we leak memory if uncaught exceptions are thrown by random magical
1008 // methods, and this is hopefully the only place where it can happen,
1009 // so if there is a chance of an exception, take the very slow path.
1010 // since catching exceptions is "undocumented/internal/forbidden" by
1011 // the new p5p powers, we need to call out to a perl function :/
1012 if (ecb_expect_false (SvAMAGIC (k)))
1013 {
1014 dSP;
1015
1016 ENTER; SAVETMPS;
1017 PUSHMARK (SP);
1018 EXTEND (SP, 3);
1019 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
1020 PUSHs (sv_2mortal (k));
1021 PUSHs (sv_2mortal (v));
1022
1023 PUTBACK;
1024 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
1025 SPAGAIN;
1026
1027 FREETMPS; LEAVE;
1028
1029 if (SvTRUE (ERRSV))
1030 ERR_ERRSV;
1031
1032 return;
1033 }
1034
1035 hv_store_ent (hv, k, v, 0);
1036 SvREFCNT_dec_NN (k);
1037
1038fail:
1039 ;
1040}
1041
518static SV * 1042static SV *
519decode_hv (dec_t *dec) 1043decode_hv (dec_t *dec)
520{ 1044{
521 HV *hv = newHV (); 1045 HV *hv = newHV ();
522 1046
523 DEC_INC_DEPTH; 1047 DEC_INC_DEPTH;
524 1048
525 if ((*dec->cur & 31) == 31) 1049 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
526 { 1050 {
527 ++dec->cur; 1051 ++dec->cur;
528 1052
529 for (;;) 1053 for (;;)
530 { 1054 {
531 WANT (1); 1055 WANT (1);
532 1056
533 if (*dec->cur == (0xe0 | 31)) 1057 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
534 { 1058 {
535 ++dec->cur; 1059 ++dec->cur;
536 break; 1060 break;
537 } 1061 }
538 1062
539 SV *k = decode_sv (dec); 1063 decode_he (dec, hv);
540 SV *v = decode_sv (dec);
541
542 hv_store_ent (hv, k, v, 0);
543 } 1064 }
544 } 1065 }
545 else 1066 else
546 { 1067 {
547 int len = decode_uint (dec); 1068 UV pairs = decode_uint (dec);
548 1069
1070 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
1071
549 while (len--) 1072 while (pairs--)
550 { 1073 decode_he (dec, hv);
551 SV *k = decode_sv (dec);
552 SV *v = decode_sv (dec);
553
554 hv_store_ent (hv, k, v, 0);
555 }
556 } 1074 }
557 1075
558 DEC_DEC_DEPTH; 1076 DEC_DEC_DEPTH;
559 return newRV_noinc ((SV *)hv); 1077 return newRV_noinc ((SV *)hv);
560 1078
561fail: 1079fail:
562 SvREFCNT_dec (hv); 1080 SvREFCNT_dec_NN (hv);
563 DEC_DEC_DEPTH; 1081 DEC_DEC_DEPTH;
564 return &PL_sv_undef; 1082 return &PL_sv_undef;
565} 1083}
566 1084
567static SV * 1085static SV *
568decode_str (dec_t *dec, int utf8) 1086decode_str (dec_t *dec, int utf8)
569{ 1087{
570 SV *sv = 0; 1088 SV *sv = 0;
571 1089
572 if ((*dec->cur & 31) == 31) 1090 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
573 { 1091 {
1092 // indefinite length strings
574 ++dec->cur; 1093 ++dec->cur;
575 1094
1095 U8 major = *dec->cur & MAJOR_MISC;
1096
576 sv = newSVpvn ("", 0); 1097 sv = newSVpvn ("", 0);
577 1098
578 // not very fast, and certainly not robust against illegal input
579 for (;;) 1099 for (;;)
580 { 1100 {
581 WANT (1); 1101 WANT (1);
582 1102
583 if (*dec->cur == (0xe0 | 31)) 1103 if ((*dec->cur - major) > LENGTH_EXT8)
1104 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
584 { 1105 {
585 ++dec->cur; 1106 ++dec->cur;
586 break; 1107 break;
587 } 1108 }
1109 else
1110 ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
588 1111
589 sv_catsv (sv, decode_sv (dec)); 1112 STRLEN len = decode_uint (dec);
1113
1114 WANT (len);
1115 sv_catpvn (sv, dec->cur, len);
1116 dec->cur += len;
590 } 1117 }
591 } 1118 }
592 else 1119 else
593 { 1120 {
594 STRLEN len = decode_uint (dec); 1121 STRLEN len = decode_uint (dec);
595 1122
596 WANT (len); 1123 WANT (len);
597 sv = newSVpvn (dec->cur, len); 1124 sv = newSVpvn (dec->cur, len);
598 dec->cur += len; 1125 dec->cur += len;
1126
1127 if (ecb_expect_false (dec->stringref)
1128 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
1129 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
599 } 1130 }
600 1131
601 if (utf8) 1132 if (utf8)
1133 {
1134 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
1135 if (!cbor_is_utf8_string (SvPVX (sv), SvCUR (sv)))
1136 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
1137
602 SvUTF8_on (sv); 1138 SvUTF8_on (sv);
1139 }
603 1140
604 return sv; 1141 return sv;
605 1142
606fail: 1143fail:
607 SvREFCNT_dec (sv); 1144 SvREFCNT_dec (sv);
609} 1146}
610 1147
611static SV * 1148static SV *
612decode_tagged (dec_t *dec) 1149decode_tagged (dec_t *dec)
613{ 1150{
1151 SV *sv = 0;
614 UV tag = decode_uint (dec); 1152 UV tag = decode_uint (dec);
1153
1154 WANT (1);
1155
1156 switch (tag)
1157 {
1158 case CBOR_TAG_MAGIC:
615 SV *sv = decode_sv (dec); 1159 sv = decode_sv (dec);
1160 break;
616 1161
617 if (tag == 55799) // 2.4.5 Self-Describe CBOR 1162 case CBOR_TAG_INDIRECTION:
1163 sv = newRV_noinc (decode_sv (dec));
1164 break;
1165
1166 case CBOR_TAG_STRINGREF_NAMESPACE:
1167 {
1168 // do not use SAVETMPS/FREETMPS, as these will
1169 // erase mortalised caches, e.g. "shareable"
1170 ENTER;
1171
1172 SAVESPTR (dec->stringref);
1173 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
1174
1175 sv = decode_sv (dec);
1176
1177 LEAVE;
1178 }
1179 break;
1180
1181 case CBOR_TAG_STRINGREF:
1182 {
1183 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1184 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
1185
1186 UV idx = decode_uint (dec);
1187
1188 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
1189 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
1190
1191 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
1192 }
1193 break;
1194
1195 case CBOR_TAG_VALUE_SHAREABLE:
1196 {
1197 if (ecb_expect_false (!dec->shareable))
1198 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
1199
1200 if (ecb_expect_false (dec->cbor.flags & (F_ALLOW_CYCLES | F_ALLOW_WEAK_CYCLES)))
1201 {
1202 // if cycles are allowed, then we store an AV as value
1203 // while it is being decoded, and gather unresolved
1204 // references in it, to be re4solved after decoding.
1205 int idx, i;
1206 AV *av = newAV ();
1207 av_push (dec->shareable, (SV *)av);
1208 idx = AvFILLp (dec->shareable);
1209
1210 sv = decode_sv (dec);
1211
1212 // the AV now contains \undef for all unresolved references,
1213 // so we fix them up here.
1214 for (i = 0; i <= AvFILLp (av); ++i)
1215 SvRV_set (AvARRAY (av)[i], SvREFCNT_inc_NN (SvRV (sv)));
1216
1217 // weaken all recursive references
1218 if (dec->cbor.flags & F_ALLOW_WEAK_CYCLES)
1219 for (i = 0; i <= AvFILLp (av); ++i)
1220 sv_rvweaken (AvARRAY (av)[i]);
1221
1222 // now replace the AV by a reference to the completed value
1223 SvREFCNT_dec_NN ((SV *)av);
1224 AvARRAY (dec->shareable)[idx] = SvREFCNT_inc_NN (sv);
1225 }
1226 else
1227 {
1228 av_push (dec->shareable, &PL_sv_undef);
1229 int idx = AvFILLp (dec->shareable);
1230 sv = decode_sv (dec);
1231 AvARRAY (dec->shareable)[idx] = SvREFCNT_inc_NN (sv);
1232 }
1233 }
1234 break;
1235
1236 case CBOR_TAG_VALUE_SHAREDREF:
1237 {
1238 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1239 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1240
1241 UV idx = decode_uint (dec);
1242
1243 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1244 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1245
1246 sv = AvARRAY (dec->shareable)[idx];
1247
1248 // reference to cycle, we create a new \undef and use that, and also
1249 // registerr it in the AV for later fixing
1250 if (ecb_expect_false (SvTYPE (sv) == SVt_PVAV))
1251 {
1252 AV *av = (AV *)sv;
1253 sv = newRV_noinc (&PL_sv_undef);
1254 av_push (av, SvREFCNT_inc_NN (sv));
1255 }
1256 else if (ecb_expect_false (sv == &PL_sv_undef)) // not yet decoded, but cycles not allowed
1257 ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
1258 else // we decoded the object earlier, no cycle
1259 sv = newSVsv (sv);
1260 }
1261 break;
1262
1263 case CBOR_TAG_PERL_OBJECT:
1264 {
1265 if (dec->cbor.flags & F_FORBID_OBJECTS)
1266 goto filter;
1267
1268 sv = decode_sv (dec);
1269
1270 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1271 ERR ("corrupted CBOR data (non-array perl object)");
1272
1273 AV *av = (AV *)SvRV (sv);
1274 int len = av_len (av) + 1;
1275 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
1276
1277 if (!stash)
1278 ERR ("cannot decode perl-object (package does not exist)");
1279
1280 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1281
1282 if (!method)
1283 ERR ("cannot decode perl-object (package does not have a THAW method)");
1284
1285 dSP;
1286
1287 ENTER; SAVETMPS;
1288 PUSHMARK (SP);
1289 EXTEND (SP, len + 1);
1290 // we re-bless the reference to get overload and other niceties right
1291 PUSHs (*av_fetch (av, 0, 1));
1292 PUSHs (sv_cbor);
1293
1294 int i;
1295
1296 for (i = 1; i < len; ++i)
1297 PUSHs (*av_fetch (av, i, 1));
1298
1299 PUTBACK;
1300 call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
1301 SPAGAIN;
1302
1303 if (SvTRUE (ERRSV))
1304 {
1305 FREETMPS; LEAVE;
1306 ERR_ERRSV;
1307 }
1308
1309 SvREFCNT_dec_NN (sv);
1310 sv = SvREFCNT_inc (POPs);
1311
1312 PUTBACK;
1313
1314 FREETMPS; LEAVE;
1315 }
1316 break;
1317
1318 default:
1319 filter:
1320 {
1321 SV *tag_sv = newSVuv (tag);
1322
1323 sv = decode_sv (dec);
1324
1325 dSP;
1326 ENTER; SAVETMPS;
1327 PUSHMARK (SP);
1328 EXTEND (SP, 2);
1329 PUSHs (tag_sv);
1330 PUSHs (sv);
1331
1332 PUTBACK;
1333 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1334 SPAGAIN;
1335
1336 if (SvTRUE (ERRSV))
1337 {
1338 SvREFCNT_dec_NN (tag_sv);
1339 FREETMPS; LEAVE;
1340 ERR_ERRSV;
1341 }
1342
1343 if (count)
1344 {
1345 SvREFCNT_dec_NN (tag_sv);
1346 SvREFCNT_dec_NN (sv);
1347 sv = SvREFCNT_inc_NN (TOPs);
1348 SP -= count;
1349 }
1350 else
1351 {
1352 AV *av = newAV ();
1353 av_push (av, tag_sv);
1354 av_push (av, sv);
1355
1356 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1357 ? cbor_tagged_stash
1358 : gv_stashpv ("CBOR::XS::Tagged" , 1);
1359 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
1360 }
1361
1362 PUTBACK;
1363
1364 FREETMPS; LEAVE;
1365 }
1366 break;
1367 }
1368
618 return sv; 1369 return sv;
619 1370
620 AV *av = newAV (); 1371fail:
621 av_push (av, newSVuv (tag)); 1372 SvREFCNT_dec (sv);
622 av_push (av, sv); 1373 return &PL_sv_undef;
623
624 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
625 ? cbor_tagged_stash
626 : gv_stashpv ("CBOR::XS::Tagged" , 1);
627
628 return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
629} 1374}
630 1375
631static SV * 1376static SV *
632decode_sv (dec_t *dec) 1377decode_sv (dec_t *dec)
633{ 1378{
634 WANT (1); 1379 WANT (1);
635 1380
636 switch (*dec->cur >> 5) 1381 switch (*dec->cur >> MAJOR_SHIFT)
637 { 1382 {
638 case 0: // unsigned int 1383 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
639 return newSVuv (decode_uint (dec)); 1384 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
640 case 1: // negative int 1385 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
641 return newSViv (-1 - (IV)decode_uint (dec)); 1386 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
642 case 2: // octet string 1387 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
643 return decode_str (dec, 0); 1388 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
644 case 3: // utf-8 string 1389 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
645 return decode_str (dec, 1); 1390
646 case 4: // array 1391 case MAJOR_MISC >> MAJOR_SHIFT:
647 return decode_av (dec);
648 case 5: // map
649 return decode_hv (dec);
650 case 6: // tag
651 return decode_tagged (dec);
652 case 7: // misc
653 switch (*dec->cur++ & 31) 1392 switch (*dec->cur++ & MINOR_MASK)
654 { 1393 {
655 case 20: 1394 case SIMPLE_FALSE:
656#if CBOR_SLOW 1395#if CBOR_SLOW
657 cbor_false = get_bool ("CBOR::XS::false"); 1396 types_false = get_bool ("Types::Serialiser::false");
658#endif 1397#endif
659 return newSVsv (cbor_false); 1398 return newSVsv (types_false);
660 case 21: 1399 case SIMPLE_TRUE:
661#if CBOR_SLOW 1400#if CBOR_SLOW
662 cbor_true = get_bool ("CBOR::XS::true"); 1401 types_true = get_bool ("Types::Serialiser::true");
663#endif 1402#endif
664 return newSVsv (cbor_true); 1403 return newSVsv (types_true);
665 case 22: 1404 case SIMPLE_NULL:
666 return newSVsv (&PL_sv_undef); 1405 return newSVsv (&PL_sv_undef);
1406 case SIMPLE_UNDEF:
1407#if CBOR_SLOW
1408 types_error = get_bool ("Types::Serialiser::error");
1409#endif
1410 return newSVsv (types_error);
667 1411
668 case 25: 1412 case MISC_FLOAT16:
669 { 1413 {
670 WANT (2); 1414 WANT (2);
671 1415
672 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1416 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
673 dec->cur += 2; 1417 dec->cur += 2;
674 1418
675 return newSVnv (ecb_binary16_to_float (fp)); 1419 return newSVnv (ecb_binary16_to_float (fp));
676 } 1420 }
677 1421
678 case 26: 1422 case MISC_FLOAT32:
679 { 1423 {
680 uint32_t fp; 1424 uint32_t fp;
681 WANT (4); 1425 WANT (4);
682 memcpy (&fp, dec->cur, 4); 1426 memcpy (&fp, dec->cur, 4);
683 dec->cur += 4; 1427 dec->cur += 4;
686 fp = ecb_bswap32 (fp); 1430 fp = ecb_bswap32 (fp);
687 1431
688 return newSVnv (ecb_binary32_to_float (fp)); 1432 return newSVnv (ecb_binary32_to_float (fp));
689 } 1433 }
690 1434
691 case 27: 1435 case MISC_FLOAT64:
692 { 1436 {
693 uint64_t fp; 1437 uint64_t fp;
694 WANT (8); 1438 WANT (8);
695 memcpy (&fp, dec->cur, 8); 1439 memcpy (&fp, dec->cur, 8);
696 dec->cur += 8; 1440 dec->cur += 8;
699 fp = ecb_bswap64 (fp); 1443 fp = ecb_bswap64 (fp);
700 1444
701 return newSVnv (ecb_binary64_to_double (fp)); 1445 return newSVnv (ecb_binary64_to_double (fp));
702 } 1446 }
703 1447
704 // 0..19 unassigned 1448 // 0..19 unassigned simple
705 // 24 reserved + unassigned (reserved values are not encodable) 1449 // 24 reserved + unassigned simple (reserved values are not encodable)
1450 // 28-30 unassigned misc
1451 // 31 break code
706 default: 1452 default:
707 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1453 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
708 } 1454 }
709 1455
710 break; 1456 break;
711 } 1457 }
712 1458
715} 1461}
716 1462
717static SV * 1463static SV *
718decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1464decode_cbor (SV *string, CBOR *cbor, char **offset_return)
719{ 1465{
720 dec_t dec; 1466 dec_t dec = { 0 };
721 SV *sv; 1467 SV *sv;
1468 STRLEN len;
1469 char *data = SvPVbyte (string, len);
722 1470
723 /* work around bugs in 5.10 where manipulating magic values
724 * makes perl ignore the magic in subsequent accesses.
725 * also make a copy of non-PV values, to get them into a clean
726 * state (SvPV should do that, but it's buggy, see below).
727 */
728 /*SvGETMAGIC (string);*/
729 if (SvMAGICAL (string) || !SvPOK (string))
730 string = sv_2mortal (newSVsv (string));
731
732 SvUPGRADE (string, SVt_PV);
733
734 /* work around a bug in perl 5.10, which causes SvCUR to fail an
735 * assertion with -DDEBUGGING, although SvCUR is documented to
736 * return the xpv_cur field which certainly exists after upgrading.
737 * according to nicholas clark, calling SvPOK fixes this.
738 * But it doesn't fix it, so try another workaround, call SvPV_nolen
739 * and hope for the best.
740 * Damnit, SvPV_nolen still trips over yet another assertion. This
741 * assertion business is seriously broken, try yet another workaround
742 * for the broken -DDEBUGGING.
743 */
744 {
745#ifdef DEBUGGING
746 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
747#else
748 STRLEN offset = SvCUR (string);
749#endif
750
751 if (offset > cbor->max_size && cbor->max_size) 1471 if (len > cbor->max_size && cbor->max_size)
752 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu", 1472 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
753 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 1473 (unsigned long)len, (unsigned long)cbor->max_size);
754 }
755
756 sv_utf8_downgrade (string, 0);
757 1474
758 dec.cbor = *cbor; 1475 dec.cbor = *cbor;
759 dec.cur = (U8 *)SvPVX (string); 1476 dec.cur = (U8 *)data;
760 dec.end = (U8 *)SvEND (string); 1477 dec.end = (U8 *)data + len;
761 dec.err = 0;
762 dec.depth = 0;
763 1478
764 sv = decode_sv (&dec); 1479 sv = decode_sv (&dec);
765 1480
766 if (offset_return) 1481 if (offset_return)
767 *offset_return = dec.cur; 1482 *offset_return = dec.cur;
770 if (dec.cur != dec.end && !dec.err) 1485 if (dec.cur != dec.end && !dec.err)
771 dec.err = "garbage after CBOR object"; 1486 dec.err = "garbage after CBOR object";
772 1487
773 if (dec.err) 1488 if (dec.err)
774 { 1489 {
1490 if (dec.shareable)
1491 {
1492 // need to break cyclic links, which would all be in shareable
1493 int i;
1494 SV **svp;
1495
1496 for (i = av_len (dec.shareable) + 1; i--; )
1497 if ((svp = av_fetch (dec.shareable, i, 0)))
1498 sv_setsv (*svp, &PL_sv_undef);
1499 }
1500
775 SvREFCNT_dec (sv); 1501 SvREFCNT_dec_NN (sv);
1502
1503 if (dec.err_sv)
1504 sv_2mortal (dec.err_sv);
1505
776 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 1506 croak ("%s, at offset %ld (octet 0x%02x)", dec.err, (long)(dec.cur - (U8 *)data), (int)(uint8_t)*dec.cur);
777 } 1507 }
778 1508
779 sv = sv_2mortal (sv); 1509 sv = sv_2mortal (sv);
780 1510
781 return sv; 1511 return sv;
782} 1512}
783 1513
1514/////////////////////////////////////////////////////////////////////////////
1515// incremental parser
1516
1517#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
1518
1519// returns 0 for notyet, 1 for success or error
1520static int
1521incr_parse (CBOR *self, SV *cborstr)
1522{
1523 STRLEN cur;
1524 SvPV (cborstr, cur);
1525
1526 while (ecb_expect_true (self->incr_need <= cur))
1527 {
1528 // table of integer count bytes
1529 static I8 incr_len[MINOR_MASK + 1] = {
1530 0, 0, 0, 0, 0, 0, 0, 0,
1531 0, 0, 0, 0, 0, 0, 0, 0,
1532 0, 0, 0, 0, 0, 0, 0, 0,
1533 1, 2, 4, 8,-1,-1,-1,-2
1534 };
1535
1536 const U8 *p = SvPVX (cborstr) + self->incr_pos;
1537 U8 m = *p & MINOR_MASK;
1538 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1539 I8 ilen = incr_len[m];
1540
1541 self->incr_need = self->incr_pos + 1;
1542
1543 if (ecb_expect_false (ilen < 0))
1544 {
1545 if (m != MINOR_INDEF)
1546 return 1; // error
1547
1548 if (*p == (MAJOR_MISC | MINOR_INDEF))
1549 {
1550 if (count >= 0)
1551 return 1; // error
1552
1553 count = 1;
1554 }
1555 else
1556 {
1557 av_push (self->incr_count, newSViv (-1)); //TODO: nest
1558 count = -1;
1559 }
1560 }
1561 else
1562 {
1563 self->incr_need += ilen;
1564 if (ecb_expect_false (self->incr_need > cur))
1565 return 0;
1566
1567 int major = *p >> MAJOR_SHIFT;
1568
1569 switch (major)
1570 {
1571 case MAJOR_TAG >> MAJOR_SHIFT:
1572 ++count; // tags merely prefix another value
1573 break;
1574
1575 case MAJOR_BYTES >> MAJOR_SHIFT:
1576 case MAJOR_TEXT >> MAJOR_SHIFT:
1577 case MAJOR_ARRAY >> MAJOR_SHIFT:
1578 case MAJOR_MAP >> MAJOR_SHIFT:
1579 {
1580 UV len;
1581
1582 if (ecb_expect_false (ilen))
1583 {
1584 len = 0;
1585
1586 do {
1587 len = (len << 8) | *++p;
1588 } while (--ilen);
1589 }
1590 else
1591 len = m;
1592
1593 switch (major)
1594 {
1595 case MAJOR_BYTES >> MAJOR_SHIFT:
1596 case MAJOR_TEXT >> MAJOR_SHIFT:
1597 self->incr_need += len;
1598 if (ecb_expect_false (self->incr_need > cur))
1599 return 0;
1600
1601 break;
1602
1603 case MAJOR_MAP >> MAJOR_SHIFT:
1604 len <<= 1;
1605 /* FALLTHROUGH */
1606 case MAJOR_ARRAY >> MAJOR_SHIFT:
1607 if (len)
1608 {
1609 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1610 count = len + 1;
1611 }
1612 break;
1613 }
1614 }
1615 }
1616 }
1617
1618 self->incr_pos = self->incr_need;
1619
1620 if (count > 0)
1621 {
1622 while (!--count)
1623 {
1624 if (!AvFILLp (self->incr_count))
1625 return 1; // done
1626
1627 SvREFCNT_dec_NN (av_pop (self->incr_count));
1628 count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1629 }
1630
1631 SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
1632 }
1633 }
1634
1635 return 0;
1636}
1637
1638
784///////////////////////////////////////////////////////////////////////////// 1639/////////////////////////////////////////////////////////////////////////////
785// XS interface functions 1640// XS interface functions
786 1641
787MODULE = CBOR::XS PACKAGE = CBOR::XS 1642MODULE = CBOR::XS PACKAGE = CBOR::XS
788 1643
789BOOT: 1644BOOT:
790{ 1645{
791 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 1646 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
792 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
793 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1); 1647 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
794 1648
795 cbor_true = get_bool ("CBOR::XS::true"); 1649 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
796 cbor_false = get_bool ("CBOR::XS::false"); 1650 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
1651
1652 types_true = get_bool ("Types::Serialiser::true" );
1653 types_false = get_bool ("Types::Serialiser::false");
1654 types_error = get_bool ("Types::Serialiser::error");
1655
1656 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1657
1658 sv_cbor = newSVpv ("CBOR", 0);
1659 SvREADONLY_on (sv_cbor);
1660
1661 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
797} 1662}
798 1663
799PROTOTYPES: DISABLE 1664PROTOTYPES: DISABLE
800 1665
801void CLONE (...) 1666void CLONE (...)
802 CODE: 1667 CODE:
803 cbor_stash = 0; 1668 cbor_stash = 0;
804 cbor_boolean_stash = 0;
805 cbor_tagged_stash = 0; 1669 cbor_tagged_stash = 0;
1670 types_error_stash = 0;
1671 types_boolean_stash = 0;
806 1672
807void new (char *klass) 1673void new (char *klass)
808 PPCODE: 1674 PPCODE:
809{ 1675{
810 SV *pv = NEWSV (0, sizeof (CBOR)); 1676 SV *pv = NEWSV (0, sizeof (CBOR));
816 ))); 1682 )));
817} 1683}
818 1684
819void shrink (CBOR *self, int enable = 1) 1685void shrink (CBOR *self, int enable = 1)
820 ALIAS: 1686 ALIAS:
821 shrink = F_SHRINK 1687 shrink = F_SHRINK
822 allow_unknown = F_ALLOW_UNKNOWN 1688 allow_unknown = F_ALLOW_UNKNOWN
1689 allow_sharing = F_ALLOW_SHARING
1690 allow_cycles = F_ALLOW_CYCLES
1691 allow_weak_cycles = F_ALLOW_WEAK_CYCLES
1692 forbid_objects = F_FORBID_OBJECTS
1693 pack_strings = F_PACK_STRINGS
1694 text_keys = F_TEXT_KEYS
1695 text_strings = F_TEXT_STRINGS
1696 validate_utf8 = F_VALIDATE_UTF8
823 PPCODE: 1697 PPCODE:
824{ 1698{
825 if (enable) 1699 if (enable)
826 self->flags |= ix; 1700 self->flags |= ix;
827 else 1701 else
830 XPUSHs (ST (0)); 1704 XPUSHs (ST (0));
831} 1705}
832 1706
833void get_shrink (CBOR *self) 1707void get_shrink (CBOR *self)
834 ALIAS: 1708 ALIAS:
835 get_shrink = F_SHRINK 1709 get_shrink = F_SHRINK
836 get_allow_unknown = F_ALLOW_UNKNOWN 1710 get_allow_unknown = F_ALLOW_UNKNOWN
1711 get_allow_sharing = F_ALLOW_SHARING
1712 get_allow_cycles = F_ALLOW_CYCLES
1713 get_allow_weak_cycles = F_ALLOW_WEAK_CYCLES
1714 get_forbid_objects = F_FORBID_OBJECTS
1715 get_pack_strings = F_PACK_STRINGS
1716 get_text_keys = F_TEXT_KEYS
1717 get_text_strings = F_TEXT_STRINGS
1718 get_validate_utf8 = F_VALIDATE_UTF8
837 PPCODE: 1719 PPCODE:
838 XPUSHs (boolSV (self->flags & ix)); 1720 XPUSHs (boolSV (self->flags & ix));
839 1721
840void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1722void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
841 PPCODE: 1723 PPCODE:
857 CODE: 1739 CODE:
858 RETVAL = self->max_size; 1740 RETVAL = self->max_size;
859 OUTPUT: 1741 OUTPUT:
860 RETVAL 1742 RETVAL
861 1743
862#if 0 //TODO 1744void filter (CBOR *self, SV *filter = 0)
863
864void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
865 PPCODE: 1745 PPCODE:
866{
867 SvREFCNT_dec (self->cb_object); 1746 SvREFCNT_dec (self->filter);
868 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0; 1747 self->filter = filter ? newSVsv (filter) : filter;
869
870 XPUSHs (ST (0)); 1748 XPUSHs (ST (0));
871}
872 1749
873void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef) 1750SV *get_filter (CBOR *self)
874 PPCODE: 1751 CODE:
875{ 1752 RETVAL = self->filter ? self->filter : NEWSV (0, 0);
876 if (!self->cb_sk_object) 1753 OUTPUT:
877 self->cb_sk_object = newHV (); 1754 RETVAL
878
879 if (SvOK (cb))
880 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
881 else
882 {
883 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
884
885 if (!HvKEYS (self->cb_sk_object))
886 {
887 SvREFCNT_dec (self->cb_sk_object);
888 self->cb_sk_object = 0;
889 }
890 }
891
892 XPUSHs (ST (0));
893}
894
895#endif
896 1755
897void encode (CBOR *self, SV *scalar) 1756void encode (CBOR *self, SV *scalar)
898 PPCODE: 1757 PPCODE:
899 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1758 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
900 XPUSHs (scalar); 1759 XPUSHs (scalar);
913 EXTEND (SP, 2); 1772 EXTEND (SP, 2);
914 PUSHs (sv); 1773 PUSHs (sv);
915 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1774 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
916} 1775}
917 1776
918#if 0 1777void incr_parse (CBOR *self, SV *cborstr)
1778 ALIAS:
1779 incr_parse_multiple = 1
1780 PPCODE:
1781{
1782 if (SvUTF8 (cborstr))
1783 sv_utf8_downgrade (cborstr, 0);
1784
1785 if (!self->incr_count)
1786 {
1787 self->incr_count = newAV ();
1788 self->incr_pos = 0;
1789 self->incr_need = 1;
1790
1791 av_push (self->incr_count, newSViv (1));
1792 }
1793
1794 do
1795 {
1796 if (!incr_parse (self, cborstr))
1797 {
1798 if (self->incr_need > self->max_size && self->max_size)
1799 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1800 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1801
1802 break;
1803 }
1804
1805 SV *sv;
1806 char *offset;
1807
1808 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1809 XPUSHs (sv);
1810
1811 sv_chop (cborstr, offset);
1812
1813 av_clear (self->incr_count);
1814 av_push (self->incr_count, newSViv (1));
1815
1816 self->incr_pos = 0;
1817 self->incr_need = self->incr_pos + 1;
1818 }
1819 while (ix);
1820}
1821
1822void incr_reset (CBOR *self)
1823 CODE:
1824{
1825 SvREFCNT_dec (self->incr_count);
1826 self->incr_count = 0;
1827}
919 1828
920void DESTROY (CBOR *self) 1829void DESTROY (CBOR *self)
921 CODE: 1830 PPCODE:
922 SvREFCNT_dec (self->cb_sk_object); 1831 cbor_free (self);
923 SvREFCNT_dec (self->cb_object);
924
925#endif
926 1832
927PROTOTYPES: ENABLE 1833PROTOTYPES: ENABLE
928 1834
929void encode_cbor (SV *scalar) 1835void encode_cbor (SV *scalar)
1836 ALIAS:
1837 encode_cbor = 0
1838 encode_cbor_sharing = F_ALLOW_SHARING
930 PPCODE: 1839 PPCODE:
931{ 1840{
932 CBOR cbor; 1841 CBOR cbor;
933 cbor_init (&cbor); 1842 cbor_init (&cbor);
1843 cbor.flags |= ix;
934 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1844 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
935 XPUSHs (scalar); 1845 XPUSHs (scalar);
936} 1846}
937 1847
938void decode_cbor (SV *cborstr) 1848void decode_cbor (SV *cborstr)
942 cbor_init (&cbor); 1852 cbor_init (&cbor);
943 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1853 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
944 XPUSHs (cborstr); 1854 XPUSHs (cborstr);
945} 1855}
946 1856
1857#ifdef __AFL_COMPILER
1858
1859void
1860afl_init ()
1861 CODE:
1862 __AFL_INIT ();
1863
1864int
1865afl_loop (unsigned int count = 10000)
1866 CODE:
1867 RETVAL = __AFL_LOOP (count);
1868 OUTPUT:
1869 RETVAL
1870
1871#endif
1872

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines