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.29 by root, Thu Nov 28 09:13:12 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 //TODO 123#define F_ALLOW_SHARING 0x00000004UL
65#define F_ALLOW_STRINGREF 0x00000008UL //TODO 124#define F_ALLOW_CYCLES 0x00000008UL
125#define F_ALLOW_WEAK_CYCLES 0x00000010UL
126#define F_FORBID_OBJECTS 0x00000020UL
127#define F_PACK_STRINGS 0x00000040UL
128#define F_TEXT_KEYS 0x00000080UL
129#define F_TEXT_STRINGS 0x00000100UL
130#define F_VALIDATE_UTF8 0x00000200UL
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 (len < 24) 264 if (ecb_expect_true (len < LENGTH_EXT1))
195 *enc->cur++ = major | len; 265 *enc->cur++ = major | len;
196 else if (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);
233} 315}
234 316
235static void 317// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
318ecb_noinline static void
236encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 319encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
237{ 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 }
338}
339
340ecb_inline void
341encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
342{
343 if (ecb_expect_false (upgrade_utf8))
344 if (!utf8)
345 {
346 encode_str_utf8 (enc, utf8, str, len);
347 return;
348 }
349
350 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
351 need (enc, len);
352 memcpy (enc->cur, str, len);
353 enc->cur += len;
354}
355
356ecb_inline void
357encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
358{
238 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF)) 359 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
239 { 360 {
240 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 361 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
241 362
242 if (SvOK (*svp)) 363 if (SvOK (*svp))
243 { 364 {
244 // already registered, use stringref 365 // already registered, use stringref
245 encode_tag (enc, CBOR_TAG_STRINGREF); 366 encode_tag (enc, CBOR_TAG_STRINGREF);
246 encode_uint (enc, 0x00, SvUV (*svp)); 367 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
247 return; 368 return;
248 } 369 }
249 else if (len >= minimum_string_length (enc->stringref_idx)) 370 else if (len >= minimum_string_length (enc->stringref_idx))
250 { 371 {
251 // register only 372 // register only
252 sv_setuv (*svp, enc->stringref_idx); 373 sv_setuv (*svp, enc->stringref_idx);
253 ++enc->stringref_idx; 374 ++enc->stringref_idx;
254 } 375 }
255 } 376 }
256 377
257 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 378 encode_str (enc, upgrade_utf8, utf8, str, len);
379}
380
381ecb_inline void
382encode_float16 (enc_t *enc, NV nv)
383{
258 need (enc, len); 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
259 memcpy (enc->cur, str, len); 393 memcpy (enc->cur, &fp, 2);
260 enc->cur += len; 394 enc->cur += 2;
261} 395}
262 396
263static void encode_sv (enc_t *enc, SV *sv); 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}
264 511
265static void 512static void
266encode_av (enc_t *enc, AV *av) 513encode_av (enc_t *enc, AV *av)
267{ 514{
268 int i, len = av_len (av); 515 int i, len = av_len (av);
270 if (enc->depth >= enc->cbor.max_depth) 517 if (enc->depth >= enc->cbor.max_depth)
271 croak (ERR_NESTING_EXCEEDED); 518 croak (ERR_NESTING_EXCEEDED);
272 519
273 ++enc->depth; 520 ++enc->depth;
274 521
275 encode_uint (enc, 0x80, len + 1); 522 encode_uint (enc, MAJOR_ARRAY, len + 1);
276 523
524 if (ecb_expect_false (SvMAGICAL (av)))
277 for (i = 0; i <= len; ++i) 525 for (i = 0; i <= len; ++i)
278 { 526 {
279 SV **svp = av_fetch (av, i, 0); 527 SV **svp = av_fetch (av, i, 0);
280 encode_sv (enc, svp ? *svp : &PL_sv_undef); 528 encode_sv (enc, svp ? *svp : &PL_sv_undef);
281 } 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 }
282 536
283 --enc->depth; 537 --enc->depth;
284} 538}
285 539
286static void 540static void
294 ++enc->depth; 548 ++enc->depth;
295 549
296 int pairs = hv_iterinit (hv); 550 int pairs = hv_iterinit (hv);
297 int mg = SvMAGICAL (hv); 551 int mg = SvMAGICAL (hv);
298 552
299 if (mg) 553 if (ecb_expect_false (mg))
300 encode_ch (enc, 0xa0 | 31); 554 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
301 else 555 else
302 encode_uint (enc, 0xa0, pairs); 556 encode_uint (enc, MAJOR_MAP, pairs);
303 557
304 while ((he = hv_iternext (hv))) 558 while ((he = hv_iternext (hv)))
305 { 559 {
306 if (HeKLEN (he) == HEf_SVKEY) 560 if (HeKLEN (he) == HEf_SVKEY)
307 encode_sv (enc, HeSVKEY (he)); 561 encode_sv (enc, HeSVKEY (he));
308 else 562 else
309 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 563 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
310 564
311 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));
312 } 566 }
313 567
314 if (mg) 568 if (ecb_expect_false (mg))
315 encode_ch (enc, 0xe0 | 31); 569 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
316 570
317 --enc->depth; 571 --enc->depth;
318} 572}
319 573
320// encode objects, arrays and special \0=false and \1=true values. 574// encode objects, arrays and special \0=false and \1=true values.
321static void 575static void
322encode_rv (enc_t *enc, SV *sv) 576encode_rv (enc_t *enc, SV *sv)
323{ 577{
324 SvGETMAGIC (sv); 578 SvGETMAGIC (sv);
325
326 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
327 && ecb_expect_false (SvREFCNT (sv) > 1))
328 {
329 if (!enc->shareable)
330 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
331
332 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
333
334 if (SvOK (*svp))
335 {
336 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
337 encode_uint (enc, 0x00, SvUV (*svp));
338 return;
339 }
340 else
341 {
342 sv_setuv (*svp, enc->shareable_idx);
343 ++enc->shareable_idx;
344 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
345 }
346 }
347 579
348 svtype svt = SvTYPE (sv); 580 svtype svt = SvTYPE (sv);
349 581
350 if (ecb_expect_false (SvOBJECT (sv))) 582 if (ecb_expect_false (SvOBJECT (sv)))
351 { 583 {
358 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 590 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
359 ? cbor_tagged_stash 591 ? cbor_tagged_stash
360 : gv_stashpv ("CBOR::XS::Tagged" , 1); 592 : gv_stashpv ("CBOR::XS::Tagged" , 1);
361 593
362 HV *stash = SvSTASH (sv); 594 HV *stash = SvSTASH (sv);
363 GV *method;
364 595
365 if (stash == boolean_stash) 596 if (stash == boolean_stash)
366 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 597 {
598 encode_bool (enc, SvIV (sv));
599 return;
600 }
367 else if (stash == error_stash) 601 else if (stash == error_stash)
368 encode_ch (enc, 0xe0 | 23); 602 {
603 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
604 return;
605 }
369 else if (stash == tagged_stash) 606 else if (stash == tagged_stash)
370 { 607 {
371 if (svt != SVt_PVAV) 608 if (svt != SVt_PVAV)
372 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 609 croak ("encountered CBOR::XS::Tagged object that isn't an array");
373 610
611 switch (av_len ((AV *)sv))
612 {
613 case 2-1:
614 // actually a tagged value
374 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 615 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
375 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 616 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
617 break;
618
619 case 3-1:
620 // a forced type [value, type, undef]
621 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
622 break;
623
624 default:
625 croak ("encountered malformed CBOR::XS::Tagged object");
626 }
627
628 return;
629 }
630 }
631
632 if (ecb_expect_false (SvREFCNT (sv) > 1)
633 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
634 {
635 if (ecb_expect_false (!enc->shareable))
636 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
637
638 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
639
640 if (SvOK (*svp))
376 } 641 {
642 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
643 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
644 return;
645 }
646 else
647 {
648 sv_setuv (*svp, enc->shareable_idx);
649 ++enc->shareable_idx;
650 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
651 }
652 }
653
654 if (ecb_expect_false (SvOBJECT (sv)))
655 {
656 HV *stash = SvSTASH (sv);
657 GV *method;
658
659 if (enc->cbor.flags & F_FORBID_OBJECTS)
660 croak ("encountered object '%s', but forbid_objects is enabled",
661 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
377 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 662 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
378 { 663 {
379 dSP; 664 dSP;
380 665
381 ENTER; SAVETMPS; PUSHMARK (SP); 666 ENTER; SAVETMPS;
667 PUSHMARK (SP);
382 // 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
383 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 669 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
384 670
385 PUTBACK; 671 PUTBACK;
386 // G_SCALAR ensures that return value is 1 672 // G_SCALAR ensures that return value is 1
399 } 685 }
400 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 686 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
401 { 687 {
402 dSP; 688 dSP;
403 689
404 ENTER; SAVETMPS; PUSHMARK (SP); 690 ENTER; SAVETMPS;
691 PUSHMARK (SP);
405 EXTEND (SP, 2); 692 EXTEND (SP, 2);
406 // 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
407 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 694 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
408 PUSHs (sv_cbor); 695 PUSHs (sv_cbor);
409 696
414 // catch this surprisingly common error 701 // catch this surprisingly common error
415 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 702 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
416 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));
417 704
418 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 705 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
419 encode_uint (enc, 0x80, count + 1); 706 encode_uint (enc, MAJOR_ARRAY, count + 1);
420 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 707 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
421 708
422 while (count) 709 {
710 int i;
711
712 for (i = 0; i < count; ++i)
423 encode_sv (enc, SP[1 - count--]); 713 encode_sv (enc, SP[i + 1 - count]);
714
715 SP -= count;
716 }
424 717
425 PUTBACK; 718 PUTBACK;
426 719
427 FREETMPS; LEAVE; 720 FREETMPS; LEAVE;
428 } 721 }
446{ 739{
447 double nv = SvNVX (sv); 740 double nv = SvNVX (sv);
448 741
449 need (enc, 9); 742 need (enc, 9);
450 743
451 if (ecb_expect_false (nv == (U32)nv)) 744 if (ecb_expect_false (nv == (NV)(U32)nv))
452 encode_uint (enc, 0x00, (U32)nv); 745 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
453 //TODO: maybe I32? 746 //TODO: maybe I32?
454 else if (ecb_expect_false (nv == (float)nv)) 747 else if (ecb_expect_false (nv == (float)nv))
455 { 748 encode_float32 (enc, nv);
456 uint32_t fp = ecb_float_to_binary32 (nv);
457
458 *enc->cur++ = 0xe0 | 26;
459
460 if (!ecb_big_endian ())
461 fp = ecb_bswap32 (fp);
462
463 memcpy (enc->cur, &fp, 4);
464 enc->cur += 4;
465 }
466 else 749 else
467 { 750 encode_float64 (enc, nv);
468 uint64_t fp = ecb_double_to_binary64 (nv);
469
470 *enc->cur++ = 0xe0 | 27;
471
472 if (!ecb_big_endian ())
473 fp = ecb_bswap64 (fp);
474
475 memcpy (enc->cur, &fp, 8);
476 enc->cur += 8;
477 }
478} 751}
479 752
480static void 753static void
481encode_sv (enc_t *enc, SV *sv) 754encode_sv (enc_t *enc, SV *sv)
482{ 755{
484 757
485 if (SvPOKp (sv)) 758 if (SvPOKp (sv))
486 { 759 {
487 STRLEN len; 760 STRLEN len;
488 char *str = SvPV (sv, len); 761 char *str = SvPV (sv, len);
489 encode_str (enc, SvUTF8 (sv), str, len); 762 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
490 } 763 }
491 else if (SvNOKp (sv)) 764 else if (SvNOKp (sv))
492 encode_nv (enc, sv); 765 encode_nv (enc, sv);
493 else if (SvIOKp (sv)) 766 else if (SvIOKp (sv))
494 { 767 encode_int (enc, sv);
495 if (SvIsUV (sv))
496 encode_uint (enc, 0x00, SvUVX (sv));
497 else if (SvIVX (sv) >= 0)
498 encode_uint (enc, 0x00, SvIVX (sv));
499 else
500 encode_uint (enc, 0x20, -(SvIVX (sv) + 1));
501 }
502 else if (SvROK (sv)) 768 else if (SvROK (sv))
503 encode_rv (enc, SvRV (sv)); 769 encode_rv (enc, SvRV (sv));
504 else if (!SvOK (sv)) 770 else if (!SvOK (sv))
505 encode_ch (enc, 0xe0 | 22); 771 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
506 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 772 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
507 encode_ch (enc, 0xe0 | 23); 773 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
508 else 774 else
509 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",
510 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 776 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
511} 777}
512 778
513static SV * 779static SV *
514encode_cbor (SV *scalar, CBOR *cbor) 780encode_cbor (SV *scalar, CBOR *cbor)
515{ 781{
516 enc_t enc = { }; 782 enc_t enc = { 0 };
517 783
518 enc.cbor = *cbor; 784 enc.cbor = *cbor;
519 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 785 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
520 enc.cur = SvPVX (enc.sv); 786 enc.cur = SvPVX (enc.sv);
521 enc.end = SvEND (enc.sv); 787 enc.end = SvEND (enc.sv);
522 788
523 SvPOK_only (enc.sv); 789 SvPOK_only (enc.sv);
524 790
525 if (cbor->flags & F_ALLOW_STRINGREF) 791 if (cbor->flags & F_PACK_STRINGS)
526 { 792 {
527 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE); 793 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
528 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ()); 794 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
529 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ()); 795 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
530 } 796 }
553 U32 depth; // recursion depth 819 U32 depth; // recursion depth
554 U32 maxdepth; // recursion depth limit 820 U32 maxdepth; // recursion depth limit
555 AV *shareable; 821 AV *shareable;
556 AV *stringref; 822 AV *stringref;
557 SV *decode_tagged; 823 SV *decode_tagged;
824 SV *err_sv; // optional sv for error, needs to be freed
558} dec_t; 825} dec_t;
559 826
560#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);
561 834
562#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;
563 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
564#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)
565#define DEC_DEC_DEPTH --dec->depth 864#define DEC_DEC_DEPTH --dec->depth
566 865
567static UV 866static UV
568decode_uint (dec_t *dec) 867decode_uint (dec_t *dec)
569{ 868{
570 switch (*dec->cur & 31) 869 U8 m = *dec->cur & MINOR_MASK;
571 { 870 ++dec->cur;
572 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
573 case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
574 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
575 return *dec->cur++ & 31;
576 871
577 case 24: 872 if (ecb_expect_true (m < LENGTH_EXT1))
873 return m;
874 else if (ecb_expect_true (m == LENGTH_EXT1))
875 {
578 WANT (2); 876 WANT (1);
579 dec->cur += 2; 877 dec->cur += 1;
580 return dec->cur[-1]; 878 return dec->cur[-1];
581 879 }
582 case 25: 880 else if (ecb_expect_true (m == LENGTH_EXT2))
881 {
583 WANT (3); 882 WANT (2);
584 dec->cur += 3; 883 dec->cur += 2;
585 return (((UV)dec->cur[-2]) << 8) 884 return (((UV)dec->cur[-2]) << 8)
586 | ((UV)dec->cur[-1]); 885 | ((UV)dec->cur[-1]);
587 886 }
588 case 26: 887 else if (ecb_expect_true (m == LENGTH_EXT4))
888 {
589 WANT (5); 889 WANT (4);
590 dec->cur += 5; 890 dec->cur += 4;
591 return (((UV)dec->cur[-4]) << 24) 891 return (((UV)dec->cur[-4]) << 24)
592 | (((UV)dec->cur[-3]) << 16) 892 | (((UV)dec->cur[-3]) << 16)
593 | (((UV)dec->cur[-2]) << 8) 893 | (((UV)dec->cur[-2]) << 8)
594 | ((UV)dec->cur[-1]); 894 | ((UV)dec->cur[-1]);
595 895 }
596 case 27: 896 else if (ecb_expect_true (m == LENGTH_EXT8))
897 {
597 WANT (9); 898 WANT (8);
598 dec->cur += 9; 899 dec->cur += 8;
900
901 return
902#if UVSIZE < 8
903 0
904#else
599 return (((UV)dec->cur[-8]) << 56) 905 (((UV)dec->cur[-8]) << 56)
600 | (((UV)dec->cur[-7]) << 48) 906 | (((UV)dec->cur[-7]) << 48)
601 | (((UV)dec->cur[-6]) << 40) 907 | (((UV)dec->cur[-6]) << 40)
602 | (((UV)dec->cur[-5]) << 32) 908 | (((UV)dec->cur[-5]) << 32)
909#endif
603 | (((UV)dec->cur[-4]) << 24) 910 | (((UV)dec->cur[-4]) << 24)
604 | (((UV)dec->cur[-3]) << 16) 911 | (((UV)dec->cur[-3]) << 16)
605 | (((UV)dec->cur[-2]) << 8) 912 | (((UV)dec->cur[-2]) << 8)
606 | ((UV)dec->cur[-1]); 913 | ((UV)dec->cur[-1]);
607 914 }
608 default: 915 else
609 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 916 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
610 }
611 917
612fail: 918fail:
613 return 0; 919 return 0;
614} 920}
615 921
620{ 926{
621 AV *av = newAV (); 927 AV *av = newAV ();
622 928
623 DEC_INC_DEPTH; 929 DEC_INC_DEPTH;
624 930
625 if ((*dec->cur & 31) == 31) 931 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
626 { 932 {
627 ++dec->cur; 933 ++dec->cur;
628 934
629 for (;;) 935 for (;;)
630 { 936 {
631 WANT (1); 937 WANT (1);
632 938
633 if (*dec->cur == (0xe0 | 31)) 939 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
634 { 940 {
635 ++dec->cur; 941 ++dec->cur;
636 break; 942 break;
637 } 943 }
638 944
639 av_push (av, decode_sv (dec)); 945 av_push (av, decode_sv (dec));
640 } 946 }
641 } 947 }
642 else 948 else
643 { 949 {
644 int i, len = decode_uint (dec); 950 UV i, len = decode_uint (dec);
645 951
952 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
646 av_fill (av, len - 1); 953 av_fill (av, len - 1);
647 954
648 for (i = 0; i < len; ++i) 955 for (i = 0; i < len; ++i)
649 AvARRAY (av)[i] = decode_sv (dec); 956 AvARRAY (av)[i] = decode_sv (dec);
650 } 957 }
651 958
652 DEC_DEC_DEPTH; 959 DEC_DEC_DEPTH;
653 return newRV_noinc ((SV *)av); 960 return newRV_noinc ((SV *)av);
654 961
655fail: 962fail:
656 SvREFCNT_dec (av); 963 SvREFCNT_dec_NN (av);
657 DEC_DEC_DEPTH; 964 DEC_DEC_DEPTH;
658 return &PL_sv_undef; 965 return &PL_sv_undef;
659} 966}
660 967
661static void 968static void
663{ 970{
664 // for speed reasons, we specialcase single-string 971 // for speed reasons, we specialcase single-string
665 // byte or utf-8 strings as keys, but only when !stringref 972 // byte or utf-8 strings as keys, but only when !stringref
666 973
667 if (ecb_expect_true (!dec->stringref)) 974 if (ecb_expect_true (!dec->stringref))
668 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27) 975 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
669 { 976 {
670 I32 len = decode_uint (dec); 977 STRLEN len = decode_uint (dec);
671 char *key = (char *)dec->cur; 978 char *key = (char *)dec->cur;
672 979
980 WANT (len);
673 dec->cur += len; 981 dec->cur += len;
674 982
675 if (ecb_expect_false (dec->stringref))
676 av_push (dec->stringref, newSVpvn (key, len));
677
678 hv_store (hv, key, len, decode_sv (dec), 0); 983 hv_store (hv, key, len, decode_sv (dec), 0);
679 984
680 return; 985 return;
681 } 986 }
682 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27) 987 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
683 { 988 {
684 I32 len = decode_uint (dec); 989 STRLEN len = decode_uint (dec);
685 char *key = (char *)dec->cur; 990 char *key = (char *)dec->cur;
686 991
992 WANT (len);
687 dec->cur += len; 993 dec->cur += len;
688 994
689 if (ecb_expect_false (dec->stringref)) 995 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
690 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)");
691 998
692 hv_store (hv, key, -len, decode_sv (dec), 0); 999 hv_store (hv, key, -len, decode_sv (dec), 0);
693 1000
694 return; 1001 return;
695 } 1002 }
696 1003
697 SV *k = decode_sv (dec); 1004 SV *k = decode_sv (dec);
698 SV *v = decode_sv (dec); 1005 SV *v = decode_sv (dec);
699 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
700 hv_store_ent (hv, k, v, 0); 1035 hv_store_ent (hv, k, v, 0);
701 SvREFCNT_dec (k); 1036 SvREFCNT_dec_NN (k);
1037
1038fail:
1039 ;
702} 1040}
703 1041
704static SV * 1042static SV *
705decode_hv (dec_t *dec) 1043decode_hv (dec_t *dec)
706{ 1044{
707 HV *hv = newHV (); 1045 HV *hv = newHV ();
708 1046
709 DEC_INC_DEPTH; 1047 DEC_INC_DEPTH;
710 1048
711 if ((*dec->cur & 31) == 31) 1049 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
712 { 1050 {
713 ++dec->cur; 1051 ++dec->cur;
714 1052
715 for (;;) 1053 for (;;)
716 { 1054 {
717 WANT (1); 1055 WANT (1);
718 1056
719 if (*dec->cur == (0xe0 | 31)) 1057 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
720 { 1058 {
721 ++dec->cur; 1059 ++dec->cur;
722 break; 1060 break;
723 } 1061 }
724 1062
725 decode_he (dec, hv); 1063 decode_he (dec, hv);
726 } 1064 }
727 } 1065 }
728 else 1066 else
729 { 1067 {
730 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
731 1071
732 while (pairs--) 1072 while (pairs--)
733 decode_he (dec, hv); 1073 decode_he (dec, hv);
734 } 1074 }
735 1075
736 DEC_DEC_DEPTH; 1076 DEC_DEC_DEPTH;
737 return newRV_noinc ((SV *)hv); 1077 return newRV_noinc ((SV *)hv);
738 1078
739fail: 1079fail:
740 SvREFCNT_dec (hv); 1080 SvREFCNT_dec_NN (hv);
741 DEC_DEC_DEPTH; 1081 DEC_DEC_DEPTH;
742 return &PL_sv_undef; 1082 return &PL_sv_undef;
743} 1083}
744 1084
745static SV * 1085static SV *
746decode_str (dec_t *dec, int utf8) 1086decode_str (dec_t *dec, int utf8)
747{ 1087{
748 SV *sv = 0; 1088 SV *sv = 0;
749 1089
750 if ((*dec->cur & 31) == 31) 1090 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
751 { 1091 {
1092 // indefinite length strings
752 ++dec->cur; 1093 ++dec->cur;
753 1094
1095 U8 major = *dec->cur & MAJOR_MISC;
1096
754 sv = newSVpvn ("", 0); 1097 sv = newSVpvn ("", 0);
755 1098
756 // not very fast, and certainly not robust against illegal input
757 for (;;) 1099 for (;;)
758 { 1100 {
759 WANT (1); 1101 WANT (1);
760 1102
761 if (*dec->cur == (0xe0 | 31)) 1103 if ((*dec->cur - major) > LENGTH_EXT8)
1104 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
762 { 1105 {
763 ++dec->cur; 1106 ++dec->cur;
764 break; 1107 break;
765 } 1108 }
1109 else
1110 ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
766 1111
767 sv_catsv (sv, decode_sv (dec)); 1112 STRLEN len = decode_uint (dec);
1113
1114 WANT (len);
1115 sv_catpvn (sv, dec->cur, len);
1116 dec->cur += len;
768 } 1117 }
769 } 1118 }
770 else 1119 else
771 { 1120 {
772 STRLEN len = decode_uint (dec); 1121 STRLEN len = decode_uint (dec);
779 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1)) 1128 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
780 av_push (dec->stringref, SvREFCNT_inc_NN (sv)); 1129 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
781 } 1130 }
782 1131
783 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
784 SvUTF8_on (sv); 1138 SvUTF8_on (sv);
1139 }
785 1140
786 return sv; 1141 return sv;
787 1142
788fail: 1143fail:
789 SvREFCNT_dec (sv); 1144 SvREFCNT_dec (sv);
808 sv = newRV_noinc (decode_sv (dec)); 1163 sv = newRV_noinc (decode_sv (dec));
809 break; 1164 break;
810 1165
811 case CBOR_TAG_STRINGREF_NAMESPACE: 1166 case CBOR_TAG_STRINGREF_NAMESPACE:
812 { 1167 {
1168 // do not use SAVETMPS/FREETMPS, as these will
1169 // erase mortalised caches, e.g. "shareable"
813 ENTER; SAVETMPS; 1170 ENTER;
814 1171
815 SAVESPTR (dec->stringref); 1172 SAVESPTR (dec->stringref);
816 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1173 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
817 1174
818 sv = decode_sv (dec); 1175 sv = decode_sv (dec);
819 1176
820 FREETMPS; LEAVE; 1177 LEAVE;
821 } 1178 }
822 break; 1179 break;
823 1180
824 case CBOR_TAG_STRINGREF: 1181 case CBOR_TAG_STRINGREF:
825 { 1182 {
826 if ((*dec->cur >> 5) != 0) 1183 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
827 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1184 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
828 1185
829 UV idx = decode_uint (dec); 1186 UV idx = decode_uint (dec);
830 1187
831 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1188 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
832 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)");
833 1190
834 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1191 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
835 } 1192 }
836 break; 1193 break;
838 case CBOR_TAG_VALUE_SHAREABLE: 1195 case CBOR_TAG_VALUE_SHAREABLE:
839 { 1196 {
840 if (ecb_expect_false (!dec->shareable)) 1197 if (ecb_expect_false (!dec->shareable))
841 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ()); 1198 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
842 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;
843 sv = newSV (0); 1206 AV *av = newAV ();
844 av_push (dec->shareable, SvREFCNT_inc_NN (sv)); 1207 av_push (dec->shareable, (SV *)av);
1208 idx = AvFILLp (dec->shareable);
845 1209
846 SV *osv = decode_sv (dec); 1210 sv = decode_sv (dec);
847 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
848 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 }
849 } 1233 }
850 break; 1234 break;
851 1235
852 case CBOR_TAG_VALUE_SHAREDREF: 1236 case CBOR_TAG_VALUE_SHAREDREF:
853 { 1237 {
854 if ((*dec->cur >> 5) != 0) 1238 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
855 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1239 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
856 1240
857 UV idx = decode_uint (dec); 1241 UV idx = decode_uint (dec);
858 1242
859 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1243 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
860 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1244 ERR ("corrupted CBOR data (sharedref index out of bounds)");
861 1245
862 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);
863 } 1260 }
864 break; 1261 break;
865 1262
866 case CBOR_TAG_PERL_OBJECT: 1263 case CBOR_TAG_PERL_OBJECT:
867 { 1264 {
1265 if (dec->cbor.flags & F_FORBID_OBJECTS)
1266 goto filter;
1267
868 sv = decode_sv (dec); 1268 sv = decode_sv (dec);
869 1269
870 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1270 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
871 ERR ("corrupted CBOR data (non-array perl object)"); 1271 ERR ("corrupted CBOR data (non-array perl object)");
872 1272
882 if (!method) 1282 if (!method)
883 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)");
884 1284
885 dSP; 1285 dSP;
886 1286
887 ENTER; SAVETMPS; PUSHMARK (SP); 1287 ENTER; SAVETMPS;
1288 PUSHMARK (SP);
888 EXTEND (SP, len + 1); 1289 EXTEND (SP, len + 1);
889 // 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
890 PUSHs (*av_fetch (av, 0, 1)); 1291 PUSHs (*av_fetch (av, 0, 1));
891 PUSHs (sv_cbor); 1292 PUSHs (sv_cbor);
892 1293
900 SPAGAIN; 1301 SPAGAIN;
901 1302
902 if (SvTRUE (ERRSV)) 1303 if (SvTRUE (ERRSV))
903 { 1304 {
904 FREETMPS; LEAVE; 1305 FREETMPS; LEAVE;
905 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1306 ERR_ERRSV;
906 } 1307 }
907 1308
908 SvREFCNT_dec (sv); 1309 SvREFCNT_dec_NN (sv);
909 sv = SvREFCNT_inc (POPs); 1310 sv = SvREFCNT_inc (POPs);
910 1311
911 PUTBACK; 1312 PUTBACK;
912 1313
913 FREETMPS; LEAVE; 1314 FREETMPS; LEAVE;
914 } 1315 }
915 break; 1316 break;
916 1317
917 default: 1318 default:
1319 filter:
918 { 1320 {
1321 SV *tag_sv = newSVuv (tag);
1322
919 sv = decode_sv (dec); 1323 sv = decode_sv (dec);
920 1324
921 dSP; 1325 dSP;
922 ENTER; SAVETMPS; PUSHMARK (SP); 1326 ENTER; SAVETMPS;
1327 PUSHMARK (SP);
923 EXTEND (SP, 2); 1328 EXTEND (SP, 2);
924 PUSHs (newSVuv (tag)); 1329 PUSHs (tag_sv);
925 PUSHs (sv); 1330 PUSHs (sv);
926 1331
927 PUTBACK; 1332 PUTBACK;
928 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);
929 SPAGAIN; 1334 SPAGAIN;
930 1335
931 if (SvTRUE (ERRSV)) 1336 if (SvTRUE (ERRSV))
932 { 1337 {
1338 SvREFCNT_dec_NN (tag_sv);
933 FREETMPS; LEAVE; 1339 FREETMPS; LEAVE;
934 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1340 ERR_ERRSV;
935 } 1341 }
936 1342
937 if (count) 1343 if (count)
938 { 1344 {
1345 SvREFCNT_dec_NN (tag_sv);
939 SvREFCNT_dec (sv); 1346 SvREFCNT_dec_NN (sv);
940 sv = SvREFCNT_inc (POPs); 1347 sv = SvREFCNT_inc_NN (TOPs);
1348 SP -= count;
941 } 1349 }
942 else 1350 else
943 { 1351 {
944 AV *av = newAV (); 1352 AV *av = newAV ();
945 av_push (av, newSVuv (tag)); 1353 av_push (av, tag_sv);
946 av_push (av, sv); 1354 av_push (av, sv);
947 1355
948 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1356 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
949 ? cbor_tagged_stash 1357 ? cbor_tagged_stash
950 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1358 : gv_stashpv ("CBOR::XS::Tagged" , 1);
968static SV * 1376static SV *
969decode_sv (dec_t *dec) 1377decode_sv (dec_t *dec)
970{ 1378{
971 WANT (1); 1379 WANT (1);
972 1380
973 switch (*dec->cur >> 5) 1381 switch (*dec->cur >> MAJOR_SHIFT)
974 { 1382 {
975 case 0: // unsigned int 1383 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
976 return newSVuv (decode_uint (dec)); 1384 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
977 case 1: // negative int 1385 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
978 return newSViv (-1 - (IV)decode_uint (dec)); 1386 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
979 case 2: // octet string 1387 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
980 return decode_str (dec, 0); 1388 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
981 case 3: // utf-8 string 1389 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
982 return decode_str (dec, 1); 1390
983 case 4: // array 1391 case MAJOR_MISC >> MAJOR_SHIFT:
984 return decode_av (dec);
985 case 5: // map
986 return decode_hv (dec);
987 case 6: // tag
988 return decode_tagged (dec);
989 case 7: // misc
990 switch (*dec->cur++ & 31) 1392 switch (*dec->cur++ & MINOR_MASK)
991 { 1393 {
992 case 20: 1394 case SIMPLE_FALSE:
993#if CBOR_SLOW 1395#if CBOR_SLOW
994 types_false = get_bool ("Types::Serialiser::false"); 1396 types_false = get_bool ("Types::Serialiser::false");
995#endif 1397#endif
996 return newSVsv (types_false); 1398 return newSVsv (types_false);
997 case 21: 1399 case SIMPLE_TRUE:
998#if CBOR_SLOW 1400#if CBOR_SLOW
999 types_true = get_bool ("Types::Serialiser::true"); 1401 types_true = get_bool ("Types::Serialiser::true");
1000#endif 1402#endif
1001 return newSVsv (types_true); 1403 return newSVsv (types_true);
1002 case 22: 1404 case SIMPLE_NULL:
1003 return newSVsv (&PL_sv_undef); 1405 return newSVsv (&PL_sv_undef);
1004 case 23: 1406 case SIMPLE_UNDEF:
1005#if CBOR_SLOW 1407#if CBOR_SLOW
1006 types_error = get_bool ("Types::Serialiser::error"); 1408 types_error = get_bool ("Types::Serialiser::error");
1007#endif 1409#endif
1008 return newSVsv (types_error); 1410 return newSVsv (types_error);
1009 1411
1010 case 25: 1412 case MISC_FLOAT16:
1011 { 1413 {
1012 WANT (2); 1414 WANT (2);
1013 1415
1014 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1416 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
1015 dec->cur += 2; 1417 dec->cur += 2;
1016 1418
1017 return newSVnv (ecb_binary16_to_float (fp)); 1419 return newSVnv (ecb_binary16_to_float (fp));
1018 } 1420 }
1019 1421
1020 case 26: 1422 case MISC_FLOAT32:
1021 { 1423 {
1022 uint32_t fp; 1424 uint32_t fp;
1023 WANT (4); 1425 WANT (4);
1024 memcpy (&fp, dec->cur, 4); 1426 memcpy (&fp, dec->cur, 4);
1025 dec->cur += 4; 1427 dec->cur += 4;
1028 fp = ecb_bswap32 (fp); 1430 fp = ecb_bswap32 (fp);
1029 1431
1030 return newSVnv (ecb_binary32_to_float (fp)); 1432 return newSVnv (ecb_binary32_to_float (fp));
1031 } 1433 }
1032 1434
1033 case 27: 1435 case MISC_FLOAT64:
1034 { 1436 {
1035 uint64_t fp; 1437 uint64_t fp;
1036 WANT (8); 1438 WANT (8);
1037 memcpy (&fp, dec->cur, 8); 1439 memcpy (&fp, dec->cur, 8);
1038 dec->cur += 8; 1440 dec->cur += 8;
1041 fp = ecb_bswap64 (fp); 1443 fp = ecb_bswap64 (fp);
1042 1444
1043 return newSVnv (ecb_binary64_to_double (fp)); 1445 return newSVnv (ecb_binary64_to_double (fp));
1044 } 1446 }
1045 1447
1046 // 0..19 unassigned 1448 // 0..19 unassigned simple
1047 // 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
1048 default: 1452 default:
1049 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1453 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1050 } 1454 }
1051 1455
1052 break; 1456 break;
1053 } 1457 }
1054 1458
1057} 1461}
1058 1462
1059static SV * 1463static SV *
1060decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1464decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1061{ 1465{
1062 dec_t dec = { }; 1466 dec_t dec = { 0 };
1063 SV *sv; 1467 SV *sv;
1064 STRLEN len; 1468 STRLEN len;
1065 char *data = SvPVbyte (string, len); 1469 char *data = SvPVbyte (string, len);
1066 1470
1067 if (len > cbor->max_size && cbor->max_size) 1471 if (len > cbor->max_size && cbor->max_size)
1081 if (dec.cur != dec.end && !dec.err) 1485 if (dec.cur != dec.end && !dec.err)
1082 dec.err = "garbage after CBOR object"; 1486 dec.err = "garbage after CBOR object";
1083 1487
1084 if (dec.err) 1488 if (dec.err)
1085 { 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
1086 SvREFCNT_dec (sv); 1501 SvREFCNT_dec_NN (sv);
1502
1503 if (dec.err_sv)
1504 sv_2mortal (dec.err_sv);
1505
1087 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);
1088 } 1507 }
1089 1508
1090 sv = sv_2mortal (sv); 1509 sv = sv_2mortal (sv);
1091 1510
1092 return sv; 1511 return sv;
1093} 1512}
1094 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
1095///////////////////////////////////////////////////////////////////////////// 1639/////////////////////////////////////////////////////////////////////////////
1096// XS interface functions 1640// XS interface functions
1097 1641
1098MODULE = CBOR::XS PACKAGE = CBOR::XS 1642MODULE = CBOR::XS PACKAGE = CBOR::XS
1099 1643
1111 1655
1112 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1656 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1113 1657
1114 sv_cbor = newSVpv ("CBOR", 0); 1658 sv_cbor = newSVpv ("CBOR", 0);
1115 SvREADONLY_on (sv_cbor); 1659 SvREADONLY_on (sv_cbor);
1660
1661 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1116} 1662}
1117 1663
1118PROTOTYPES: DISABLE 1664PROTOTYPES: DISABLE
1119 1665
1120void CLONE (...) 1666void CLONE (...)
1136 ))); 1682 )));
1137} 1683}
1138 1684
1139void shrink (CBOR *self, int enable = 1) 1685void shrink (CBOR *self, int enable = 1)
1140 ALIAS: 1686 ALIAS:
1141 shrink = F_SHRINK 1687 shrink = F_SHRINK
1142 allow_unknown = F_ALLOW_UNKNOWN 1688 allow_unknown = F_ALLOW_UNKNOWN
1143 allow_sharing = F_ALLOW_SHARING 1689 allow_sharing = F_ALLOW_SHARING
1144 allow_stringref = F_ALLOW_STRINGREF 1690 allow_cycles = F_ALLOW_CYCLES
1691 allow_weak_cycles = F_ALLOW_WEAK_CYCLES
1692 forbid_objects = F_FORBID_OBJECTS
1693 pack_strings = F_PACK_STRINGS
1694 text_keys = F_TEXT_KEYS
1695 text_strings = F_TEXT_STRINGS
1696 validate_utf8 = F_VALIDATE_UTF8
1145 PPCODE: 1697 PPCODE:
1146{ 1698{
1147 if (enable) 1699 if (enable)
1148 self->flags |= ix; 1700 self->flags |= ix;
1149 else 1701 else
1152 XPUSHs (ST (0)); 1704 XPUSHs (ST (0));
1153} 1705}
1154 1706
1155void get_shrink (CBOR *self) 1707void get_shrink (CBOR *self)
1156 ALIAS: 1708 ALIAS:
1157 get_shrink = F_SHRINK 1709 get_shrink = F_SHRINK
1158 get_allow_unknown = F_ALLOW_UNKNOWN 1710 get_allow_unknown = F_ALLOW_UNKNOWN
1159 get_allow_sharing = F_ALLOW_SHARING 1711 get_allow_sharing = F_ALLOW_SHARING
1160 get_allow_stringref = F_ALLOW_STRINGREF 1712 get_allow_cycles = F_ALLOW_CYCLES
1713 get_allow_weak_cycles = F_ALLOW_WEAK_CYCLES
1714 get_forbid_objects = F_FORBID_OBJECTS
1715 get_pack_strings = F_PACK_STRINGS
1716 get_text_keys = F_TEXT_KEYS
1717 get_text_strings = F_TEXT_STRINGS
1718 get_validate_utf8 = F_VALIDATE_UTF8
1161 PPCODE: 1719 PPCODE:
1162 XPUSHs (boolSV (self->flags & ix)); 1720 XPUSHs (boolSV (self->flags & ix));
1163 1721
1164void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1722void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1165 PPCODE: 1723 PPCODE:
1214 EXTEND (SP, 2); 1772 EXTEND (SP, 2);
1215 PUSHs (sv); 1773 PUSHs (sv);
1216 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1774 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1217} 1775}
1218 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
1219void DESTROY (CBOR *self) 1829void DESTROY (CBOR *self)
1220 PPCODE: 1830 PPCODE:
1221 cbor_free (self); 1831 cbor_free (self);
1222 1832
1223PROTOTYPES: ENABLE 1833PROTOTYPES: ENABLE
1224 1834
1225void encode_cbor (SV *scalar) 1835void encode_cbor (SV *scalar)
1836 ALIAS:
1837 encode_cbor = 0
1838 encode_cbor_sharing = F_ALLOW_SHARING
1226 PPCODE: 1839 PPCODE:
1227{ 1840{
1228 CBOR cbor; 1841 CBOR cbor;
1229 cbor_init (&cbor); 1842 cbor_init (&cbor);
1843 cbor.flags |= ix;
1230 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1844 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1231 XPUSHs (scalar); 1845 XPUSHs (scalar);
1232} 1846}
1233 1847
1234void decode_cbor (SV *cborstr) 1848void decode_cbor (SV *cborstr)
1238 cbor_init (&cbor); 1852 cbor_init (&cbor);
1239 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1853 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1240 XPUSHs (cborstr); 1854 XPUSHs (cborstr);
1241} 1855}
1242 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