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