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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines