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.8 by root, Sun Oct 27 10:12:01 2013 UTC vs.
Revision 1.72 by root, Thu Oct 21 01:14:58 2021 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines