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.34 by root, Sat Nov 30 16:19:59 2013 UTC vs.
Revision 1.80 by root, Fri Sep 8 20:03:06 2023 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines