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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines