ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CBOR-XS/XS.xs
(Generate patch)

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.34 by root, Sat Nov 30 16:19:59 2013 UTC vs.
Revision 1.72 by root, Thu Oct 21 01:14:58 2021 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines