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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines