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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines