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.12 by root, Mon Oct 28 19:06:45 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"
15
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};
13 72
14// known tags 73// known tags
15enum cbor_tag 74enum cbor_tag
16{ 75{
17 // inofficial extensions (pending iana registration) 76 // extensions
18 CBOR_TAG_PERL_OBJECT = 256, 77 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
19 CBOR_TAG_GENERIC_OBJECT = 257, 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
20 84
21 // rfc7049 85 // rfc7049
22 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8 86 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
23 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any 87 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
24 CBOR_TAG_POS_BIGNUM = 2, // byte string 88 CBOR_TAG_POS_BIGNUM = 2, // byte string
25 CBOR_TAG_NEG_BIGNUM = 3, // byte string 89 CBOR_TAG_NEG_BIGNUM = 3, // byte string
26 CBOR_TAG_DECIMAL = 4, // decimal fraction, array 90 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
27 CBOR_TAG_BIGFLOAT = 5, // array 91 CBOR_TAG_BIGFLOAT = 5, // array
28 92
29 CBOR_TAG_CONV_B64U = 21, // base64url, any 93 CBOR_TAG_CONV_B64U = 21, // base64url, any
30 CBOR_TAG_CONV_B64 = 22, // base64, any 94 CBOR_TAG_CONV_B64 = 22, // base64, any
31 CBOR_TAG_CONV_HEX = 23, // base16, any 95 CBOR_TAG_CONV_HEX = 23, // base16, any
32 CBOR_TAG_CBOR = 24, // embedded cbor, byte string 96 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
33 97
34 CBOR_TAG_URI = 32, // URI rfc3986, utf-8 98 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
35 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8 99 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
36 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8 100 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
37 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8 101 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
38 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 102 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
39 103
40 CBOR_TAG_MAGIC = 55799 // self-describe cbor 104 CBOR_TAG_MAGIC = 55799, // self-describe cbor
41}; 105};
42 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
43#define F_SHRINK 0x00000200UL 121#define F_SHRINK 0x00000001UL
44#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
45 130
46#define INIT_SIZE 32 // initial scalar size to be allocated 131#define INIT_SIZE 32 // initial scalar size to be allocated
47 132
48#define SB do { 133#define SB do {
49#define SE } while (0) 134#define SE } while (0)
61# define CBOR_SLOW 0 146# define CBOR_SLOW 0
62# define CBOR_STASH cbor_stash 147# define CBOR_STASH cbor_stash
63#endif 148#endif
64 149
65static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS:: 150static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
66static SV *types_true, *types_false, *types_error, *sv_cbor; 151static SV *types_true, *types_false, *types_error, *sv_cbor, *default_filter;
67 152
68typedef struct { 153typedef struct {
69 U32 flags; 154 U32 flags;
70 U32 max_depth; 155 U32 max_depth;
71 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.
72} CBOR; 163} CBOR;
73 164
74ecb_inline void 165ecb_inline void
75cbor_init (CBOR *cbor) 166cbor_init (CBOR *cbor)
76{ 167{
77 Zero (cbor, 1, CBOR); 168 Zero (cbor, 1, CBOR);
78 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);
79} 177}
80 178
81///////////////////////////////////////////////////////////////////////////// 179/////////////////////////////////////////////////////////////////////////////
82// utility functions 180// utility functions
83 181
105 SvPV_renew (sv, SvCUR (sv) + 1); 203 SvPV_renew (sv, SvCUR (sv) + 1);
106#endif 204#endif
107 } 205 }
108} 206}
109 207
110///////////////////////////////////////////////////////////////////////////// 208// minimum length of a string to be registered for stringref
111// fp hell 209ecb_inline STRLEN
112 210minimum_string_length (UV idx)
113//TODO 211{
212 return idx <= 23 ? 3
213 : idx <= 0xffU ? 4
214 : idx <= 0xffffU ? 5
215 : idx <= 0xffffffffU ? 7
216 : 11;
217}
114 218
115///////////////////////////////////////////////////////////////////////////// 219/////////////////////////////////////////////////////////////////////////////
116// encoder 220// encoder
117 221
118// structure used for encoding CBOR 222// structure used for encoding CBOR
121 char *cur; // SvPVX (sv) + current output position 225 char *cur; // SvPVX (sv) + current output position
122 char *end; // SvEND (sv) 226 char *end; // SvEND (sv)
123 SV *sv; // result scalar 227 SV *sv; // result scalar
124 CBOR cbor; 228 CBOR cbor;
125 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;
126} enc_t; 234} enc_t;
127 235
128ecb_inline void 236ecb_inline void
129need (enc_t *enc, STRLEN len) 237need (enc_t *enc, STRLEN len)
130{ 238{
131 if (ecb_expect_false (enc->cur + len >= enc->end)) 239 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
132 { 240 {
133 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 241 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
134 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 242 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
135 enc->cur = SvPVX (enc->sv) + cur; 243 enc->cur = SvPVX (enc->sv) + cur;
136 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 244 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
137 } 245 }
138} 246}
139 247
248static void encode_sv (enc_t *enc, SV *sv);
249
140ecb_inline void 250ecb_inline void
141encode_ch (enc_t *enc, char ch) 251encode_ch (enc_t *enc, char ch)
142{ 252{
143 need (enc, 1); 253 need (enc, 1);
144 *enc->cur++ = ch; 254 *enc->cur++ = ch;
145} 255}
146 256
257// used for tags, intregers, element counts and so on
147static void 258static void
148encode_uint (enc_t *enc, int major, UV len) 259encode_uint (enc_t *enc, int major, UV len)
149{ 260{
150 need (enc, 9); 261 need (enc, 9);
151 262
152 if (len < 24) 263 if (ecb_expect_true (len < LENGTH_EXT1))
153 *enc->cur++ = major | len; 264 *enc->cur++ = major | len;
154 else if (len <= 0xff) 265 else if (ecb_expect_true (len <= 0xffU))
155 { 266 {
156 *enc->cur++ = major | 24; 267 *enc->cur++ = major | LENGTH_EXT1;
157 *enc->cur++ = len; 268 *enc->cur++ = len;
158 } 269 }
159 else if (len <= 0xffff) 270 else if (len <= 0xffffU)
160 { 271 {
161 *enc->cur++ = major | 25; 272 *enc->cur++ = major | LENGTH_EXT2;
162 *enc->cur++ = len >> 8; 273 *enc->cur++ = len >> 8;
163 *enc->cur++ = len; 274 *enc->cur++ = len;
164 } 275 }
165 else if (len <= 0xffffffff) 276 else if (len <= 0xffffffffU)
166 { 277 {
167 *enc->cur++ = major | 26; 278 *enc->cur++ = major | LENGTH_EXT4;
168 *enc->cur++ = len >> 24; 279 *enc->cur++ = len >> 24;
169 *enc->cur++ = len >> 16; 280 *enc->cur++ = len >> 16;
170 *enc->cur++ = len >> 8; 281 *enc->cur++ = len >> 8;
171 *enc->cur++ = len; 282 *enc->cur++ = len;
172 } 283 }
173 else 284 else
174 { 285 {
175 *enc->cur++ = major | 27; 286 *enc->cur++ = major | LENGTH_EXT8;
176 *enc->cur++ = len >> 56; 287 *enc->cur++ = len >> 56;
177 *enc->cur++ = len >> 48; 288 *enc->cur++ = len >> 48;
178 *enc->cur++ = len >> 40; 289 *enc->cur++ = len >> 40;
179 *enc->cur++ = len >> 32; 290 *enc->cur++ = len >> 32;
180 *enc->cur++ = len >> 24; 291 *enc->cur++ = len >> 24;
182 *enc->cur++ = len >> 8; 293 *enc->cur++ = len >> 8;
183 *enc->cur++ = len; 294 *enc->cur++ = len;
184 } 295 }
185} 296}
186 297
187static 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
188encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 318encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
189{ 319{
190 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);
191 need (enc, len); 350 need (enc, len);
192 memcpy (enc->cur, str, len); 351 memcpy (enc->cur, str, len);
193 enc->cur += len; 352 enc->cur += len;
194} 353}
195 354
196static 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}
197 510
198static void 511static void
199encode_av (enc_t *enc, AV *av) 512encode_av (enc_t *enc, AV *av)
200{ 513{
201 int i, len = av_len (av); 514 int i, len = av_len (av);
203 if (enc->depth >= enc->cbor.max_depth) 516 if (enc->depth >= enc->cbor.max_depth)
204 croak (ERR_NESTING_EXCEEDED); 517 croak (ERR_NESTING_EXCEEDED);
205 518
206 ++enc->depth; 519 ++enc->depth;
207 520
208 encode_uint (enc, 0x80, len + 1); 521 encode_uint (enc, MAJOR_ARRAY, len + 1);
209 522
523 if (ecb_expect_false (SvMAGICAL (av)))
210 for (i = 0; i <= len; ++i) 524 for (i = 0; i <= len; ++i)
211 { 525 {
212 SV **svp = av_fetch (av, i, 0); 526 SV **svp = av_fetch (av, i, 0);
213 encode_sv (enc, svp ? *svp : &PL_sv_undef); 527 encode_sv (enc, svp ? *svp : &PL_sv_undef);
214 } 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 }
215 535
216 --enc->depth; 536 --enc->depth;
217} 537}
218 538
219static void 539static void
227 ++enc->depth; 547 ++enc->depth;
228 548
229 int pairs = hv_iterinit (hv); 549 int pairs = hv_iterinit (hv);
230 int mg = SvMAGICAL (hv); 550 int mg = SvMAGICAL (hv);
231 551
232 if (mg) 552 if (ecb_expect_false (mg))
233 encode_ch (enc, 0xa0 | 31); 553 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
234 else 554 else
235 encode_uint (enc, 0xa0, pairs); 555 encode_uint (enc, MAJOR_MAP, pairs);
236 556
237 while ((he = hv_iternext (hv))) 557 while ((he = hv_iternext (hv)))
238 { 558 {
239 if (HeKLEN (he) == HEf_SVKEY) 559 if (HeKLEN (he) == HEf_SVKEY)
240 encode_sv (enc, HeSVKEY (he)); 560 encode_sv (enc, HeSVKEY (he));
241 else 561 else
242 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));
243 563
244 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));
245 } 565 }
246 566
247 if (mg) 567 if (ecb_expect_false (mg))
248 encode_ch (enc, 0xe0 | 31); 568 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
249 569
250 --enc->depth; 570 --enc->depth;
251} 571}
252 572
253// encode objects, arrays and special \0=false and \1=true values. 573// encode objects, arrays and special \0=false and \1=true values.
254static void 574static void
255encode_rv (enc_t *enc, SV *sv) 575encode_rv (enc_t *enc, SV *sv)
256{ 576{
257 svtype svt;
258
259 SvGETMAGIC (sv); 577 SvGETMAGIC (sv);
578
260 svt = SvTYPE (sv); 579 svtype svt = SvTYPE (sv);
261 580
262 if (ecb_expect_false (SvOBJECT (sv))) 581 if (ecb_expect_false (SvOBJECT (sv)))
263 { 582 {
264 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash 583 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
265 ? types_boolean_stash 584 ? types_boolean_stash
270 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 589 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
271 ? cbor_tagged_stash 590 ? cbor_tagged_stash
272 : gv_stashpv ("CBOR::XS::Tagged" , 1); 591 : gv_stashpv ("CBOR::XS::Tagged" , 1);
273 592
274 HV *stash = SvSTASH (sv); 593 HV *stash = SvSTASH (sv);
275 GV *method;
276 594
277 if (stash == boolean_stash) 595 if (stash == boolean_stash)
278 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 596 {
597 encode_bool (enc, SvIV (sv));
598 return;
599 }
279 else if (stash == error_stash) 600 else if (stash == error_stash)
280 encode_ch (enc, 0xe0 | 23); 601 {
602 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
603 return;
604 }
281 else if (stash == tagged_stash) 605 else if (stash == tagged_stash)
282 { 606 {
283 if (svt != SVt_PVAV) 607 if (svt != SVt_PVAV)
284 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 608 croak ("encountered CBOR::XS::Tagged object that isn't an array");
285 609
610 switch (av_len ((AV *)sv))
611 {
612 case 2-1:
613 // actually a tagged value
286 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 614 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
287 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))
288 } 640 {
641 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
642 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
643 return;
644 }
645 else
646 {
647 sv_setuv (*svp, enc->shareable_idx);
648 ++enc->shareable_idx;
649 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
650 }
651 }
652
653 if (ecb_expect_false (SvOBJECT (sv)))
654 {
655 HV *stash = SvSTASH (sv);
656 GV *method;
657
658 if (enc->cbor.flags & F_FORBID_OBJECTS)
659 croak ("encountered object '%s', but forbid_objects is enabled",
660 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
289 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 661 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
290 { 662 {
291 dSP; 663 dSP;
292 664
293 ENTER; SAVETMPS; PUSHMARK (SP); 665 ENTER; SAVETMPS;
666 PUSHMARK (SP);
294 // 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
295 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 668 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
296 669
297 PUTBACK; 670 PUTBACK;
298 // G_SCALAR ensures that return value is 1 671 // G_SCALAR ensures that return value is 1
311 } 684 }
312 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 685 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
313 { 686 {
314 dSP; 687 dSP;
315 688
316 ENTER; SAVETMPS; PUSHMARK (SP); 689 ENTER; SAVETMPS;
690 PUSHMARK (SP);
317 EXTEND (SP, 2); 691 EXTEND (SP, 2);
318 // we re-bless the reference to get overload and other niceties right 692 // we re-bless the reference to get overload and other niceties right
319 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 693 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
320 PUSHs (sv_cbor); 694 PUSHs (sv_cbor);
321 695
325 699
326 // catch this surprisingly common error 700 // catch this surprisingly common error
327 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 701 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
328 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 702 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
329 703
330 encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT); 704 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
331 encode_uint (enc, 0x80, count + 1); 705 encode_uint (enc, MAJOR_ARRAY, count + 1);
332 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 706 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
333 707
334 while (count) 708 {
709 int i;
710
711 for (i = 0; i < count; ++i)
335 encode_sv (enc, SP[1 - count--]); 712 encode_sv (enc, SP[i + 1 - count]);
713
714 SP -= count;
715 }
336 716
337 PUTBACK; 717 PUTBACK;
338 718
339 FREETMPS; LEAVE; 719 FREETMPS; LEAVE;
340 } 720 }
344 } 724 }
345 else if (svt == SVt_PVHV) 725 else if (svt == SVt_PVHV)
346 encode_hv (enc, (HV *)sv); 726 encode_hv (enc, (HV *)sv);
347 else if (svt == SVt_PVAV) 727 else if (svt == SVt_PVAV)
348 encode_av (enc, (AV *)sv); 728 encode_av (enc, (AV *)sv);
349 else if (svt < SVt_PVAV)
350 {
351 STRLEN len = 0;
352 char *pv = svt ? SvPV (sv, len) : 0;
353
354 if (len == 1 && *pv == '1')
355 encode_ch (enc, 0xe0 | 21);
356 else if (len == 1 && *pv == '0')
357 encode_ch (enc, 0xe0 | 20);
358 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
359 encode_ch (enc, 0xe0 | 23);
360 else
361 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
362 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
363 }
364 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
365 encode_ch (enc, 0xe0 | 23);
366 else 729 else
367 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 730 {
368 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 731 encode_tag (enc, CBOR_TAG_INDIRECTION);
732 encode_sv (enc, sv);
733 }
369} 734}
370 735
371static void 736static void
372encode_nv (enc_t *enc, SV *sv) 737encode_nv (enc_t *enc, SV *sv)
373{ 738{
374 double nv = SvNVX (sv); 739 double nv = SvNVX (sv);
375 740
376 need (enc, 9); 741 need (enc, 9);
377 742
378 if (ecb_expect_false (nv == (U32)nv)) 743 if (ecb_expect_false (nv == (NV)(U32)nv))
379 encode_uint (enc, 0x00, (U32)nv); 744 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
380 //TODO: maybe I32? 745 //TODO: maybe I32?
381 else if (ecb_expect_false (nv == (float)nv)) 746 else if (ecb_expect_false (nv == (float)nv))
382 { 747 encode_float32 (enc, nv);
383 uint32_t fp = ecb_float_to_binary32 (nv);
384
385 *enc->cur++ = 0xe0 | 26;
386
387 if (!ecb_big_endian ())
388 fp = ecb_bswap32 (fp);
389
390 memcpy (enc->cur, &fp, 4);
391 enc->cur += 4;
392 }
393 else 748 else
394 { 749 encode_float64 (enc, nv);
395 uint64_t fp = ecb_double_to_binary64 (nv);
396
397 *enc->cur++ = 0xe0 | 27;
398
399 if (!ecb_big_endian ())
400 fp = ecb_bswap64 (fp);
401
402 memcpy (enc->cur, &fp, 8);
403 enc->cur += 8;
404 }
405} 750}
406 751
407static void 752static void
408encode_sv (enc_t *enc, SV *sv) 753encode_sv (enc_t *enc, SV *sv)
409{ 754{
411 756
412 if (SvPOKp (sv)) 757 if (SvPOKp (sv))
413 { 758 {
414 STRLEN len; 759 STRLEN len;
415 char *str = SvPV (sv, len); 760 char *str = SvPV (sv, len);
416 encode_str (enc, SvUTF8 (sv), str, len); 761 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
417 } 762 }
418 else if (SvNOKp (sv)) 763 else if (SvNOKp (sv))
419 encode_nv (enc, sv); 764 encode_nv (enc, sv);
420 else if (SvIOKp (sv)) 765 else if (SvIOKp (sv))
421 { 766 encode_int (enc, sv);
422 if (SvIsUV (sv))
423 encode_uint (enc, 0x00, SvUVX (sv));
424 else if (SvIVX (sv) >= 0)
425 encode_uint (enc, 0x00, SvIVX (sv));
426 else
427 encode_uint (enc, 0x20, -(SvIVX (sv) + 1));
428 }
429 else if (SvROK (sv)) 767 else if (SvROK (sv))
430 encode_rv (enc, SvRV (sv)); 768 encode_rv (enc, SvRV (sv));
431 else if (!SvOK (sv)) 769 else if (!SvOK (sv))
432 encode_ch (enc, 0xe0 | 22); 770 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
433 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 771 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
434 encode_ch (enc, 0xe0 | 23); 772 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
435 else 773 else
436 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",
437 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 775 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
438} 776}
439 777
440static SV * 778static SV *
441encode_cbor (SV *scalar, CBOR *cbor) 779encode_cbor (SV *scalar, CBOR *cbor)
442{ 780{
443 enc_t enc; 781 enc_t enc = { 0 };
444 782
445 enc.cbor = *cbor; 783 enc.cbor = *cbor;
446 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 784 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
447 enc.cur = SvPVX (enc.sv); 785 enc.cur = SvPVX (enc.sv);
448 enc.end = SvEND (enc.sv); 786 enc.end = SvEND (enc.sv);
449 enc.depth = 0;
450 787
451 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
452 encode_sv (&enc, scalar); 797 encode_sv (&enc, scalar);
453 798
454 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 799 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
455 *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
456 801
470 U8 *end; // end of input string 815 U8 *end; // end of input string
471 const char *err; // parse error, if != 0 816 const char *err; // parse error, if != 0
472 CBOR cbor; 817 CBOR cbor;
473 U32 depth; // recursion depth 818 U32 depth; // recursion depth
474 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
475} dec_t; 824} dec_t;
476 825
477#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);
478 833
479#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;
480 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
481#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)
482#define DEC_DEC_DEPTH --dec->depth 863#define DEC_DEC_DEPTH --dec->depth
483 864
484static UV 865static UV
485decode_uint (dec_t *dec) 866decode_uint (dec_t *dec)
486{ 867{
487 switch (*dec->cur & 31) 868 U8 m = *dec->cur & MINOR_MASK;
488 { 869 ++dec->cur;
489 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
490 case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
491 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
492 return *dec->cur++ & 31;
493 870
494 case 24: 871 if (ecb_expect_true (m < LENGTH_EXT1))
872 return m;
873 else if (ecb_expect_true (m == LENGTH_EXT1))
874 {
495 WANT (2); 875 WANT (1);
496 dec->cur += 2; 876 dec->cur += 1;
497 return dec->cur[-1]; 877 return dec->cur[-1];
498 878 }
499 case 25: 879 else if (ecb_expect_true (m == LENGTH_EXT2))
880 {
500 WANT (3); 881 WANT (2);
501 dec->cur += 3; 882 dec->cur += 2;
502 return (((UV)dec->cur[-2]) << 8) 883 return (((UV)dec->cur[-2]) << 8)
503 | ((UV)dec->cur[-1]); 884 | ((UV)dec->cur[-1]);
504 885 }
505 case 26: 886 else if (ecb_expect_true (m == LENGTH_EXT4))
887 {
506 WANT (5); 888 WANT (4);
507 dec->cur += 5; 889 dec->cur += 4;
508 return (((UV)dec->cur[-4]) << 24) 890 return (((UV)dec->cur[-4]) << 24)
509 | (((UV)dec->cur[-3]) << 16) 891 | (((UV)dec->cur[-3]) << 16)
510 | (((UV)dec->cur[-2]) << 8) 892 | (((UV)dec->cur[-2]) << 8)
511 | ((UV)dec->cur[-1]); 893 | ((UV)dec->cur[-1]);
512 894 }
513 case 27: 895 else if (ecb_expect_true (m == LENGTH_EXT8))
896 {
514 WANT (9); 897 WANT (8);
515 dec->cur += 9; 898 dec->cur += 8;
899
900 return
901#if UVSIZE < 8
902 0
903#else
516 return (((UV)dec->cur[-8]) << 56) 904 (((UV)dec->cur[-8]) << 56)
517 | (((UV)dec->cur[-7]) << 48) 905 | (((UV)dec->cur[-7]) << 48)
518 | (((UV)dec->cur[-6]) << 40) 906 | (((UV)dec->cur[-6]) << 40)
519 | (((UV)dec->cur[-5]) << 32) 907 | (((UV)dec->cur[-5]) << 32)
908#endif
520 | (((UV)dec->cur[-4]) << 24) 909 | (((UV)dec->cur[-4]) << 24)
521 | (((UV)dec->cur[-3]) << 16) 910 | (((UV)dec->cur[-3]) << 16)
522 | (((UV)dec->cur[-2]) << 8) 911 | (((UV)dec->cur[-2]) << 8)
523 | ((UV)dec->cur[-1]); 912 | ((UV)dec->cur[-1]);
524 913 }
525 default: 914 else
526 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 915 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
527 }
528 916
529fail: 917fail:
530 return 0; 918 return 0;
531} 919}
532 920
537{ 925{
538 AV *av = newAV (); 926 AV *av = newAV ();
539 927
540 DEC_INC_DEPTH; 928 DEC_INC_DEPTH;
541 929
542 if ((*dec->cur & 31) == 31) 930 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
543 { 931 {
544 ++dec->cur; 932 ++dec->cur;
545 933
546 for (;;) 934 for (;;)
547 { 935 {
548 WANT (1); 936 WANT (1);
549 937
550 if (*dec->cur == (0xe0 | 31)) 938 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
551 { 939 {
552 ++dec->cur; 940 ++dec->cur;
553 break; 941 break;
554 } 942 }
555 943
556 av_push (av, decode_sv (dec)); 944 av_push (av, decode_sv (dec));
557 } 945 }
558 } 946 }
559 else 947 else
560 { 948 {
561 int i, len = decode_uint (dec); 949 UV i, len = decode_uint (dec);
562 950
951 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
563 av_fill (av, len - 1); 952 av_fill (av, len - 1);
564 953
565 for (i = 0; i < len; ++i) 954 for (i = 0; i < len; ++i)
566 AvARRAY (av)[i] = decode_sv (dec); 955 AvARRAY (av)[i] = decode_sv (dec);
567 } 956 }
568 957
569 DEC_DEC_DEPTH; 958 DEC_DEC_DEPTH;
570 return newRV_noinc ((SV *)av); 959 return newRV_noinc ((SV *)av);
571 960
572fail: 961fail:
573 SvREFCNT_dec (av); 962 SvREFCNT_dec_NN (av);
574 DEC_DEC_DEPTH; 963 DEC_DEC_DEPTH;
575 return &PL_sv_undef; 964 return &PL_sv_undef;
576} 965}
577 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
578static SV * 1042static SV *
579decode_hv (dec_t *dec) 1043decode_hv (dec_t *dec)
580{ 1044{
581 HV *hv = newHV (); 1045 HV *hv = newHV ();
582 1046
583 DEC_INC_DEPTH; 1047 DEC_INC_DEPTH;
584 1048
585 if ((*dec->cur & 31) == 31) 1049 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
586 { 1050 {
587 ++dec->cur; 1051 ++dec->cur;
588 1052
589 for (;;) 1053 for (;;)
590 { 1054 {
591 WANT (1); 1055 WANT (1);
592 1056
593 if (*dec->cur == (0xe0 | 31)) 1057 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
594 { 1058 {
595 ++dec->cur; 1059 ++dec->cur;
596 break; 1060 break;
597 } 1061 }
598 1062
599 SV *k = decode_sv (dec); 1063 decode_he (dec, hv);
600 SV *v = decode_sv (dec);
601
602 hv_store_ent (hv, k, v, 0);
603 SvREFCNT_dec (k);
604 } 1064 }
605 } 1065 }
606 else 1066 else
607 { 1067 {
608 int len = decode_uint (dec); 1068 UV pairs = decode_uint (dec);
609 1069
1070 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
1071
610 while (len--) 1072 while (pairs--)
611 { 1073 decode_he (dec, hv);
612 SV *k = decode_sv (dec);
613 SV *v = decode_sv (dec);
614
615 hv_store_ent (hv, k, v, 0);
616 SvREFCNT_dec (k);
617 }
618 } 1074 }
619 1075
620 DEC_DEC_DEPTH; 1076 DEC_DEC_DEPTH;
621 return newRV_noinc ((SV *)hv); 1077 return newRV_noinc ((SV *)hv);
622 1078
623fail: 1079fail:
624 SvREFCNT_dec (hv); 1080 SvREFCNT_dec_NN (hv);
625 DEC_DEC_DEPTH; 1081 DEC_DEC_DEPTH;
626 return &PL_sv_undef; 1082 return &PL_sv_undef;
627} 1083}
628 1084
629static SV * 1085static SV *
630decode_str (dec_t *dec, int utf8) 1086decode_str (dec_t *dec, int utf8)
631{ 1087{
632 SV *sv = 0; 1088 SV *sv = 0;
633 1089
634 if ((*dec->cur & 31) == 31) 1090 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
635 { 1091 {
1092 // indefinite length strings
636 ++dec->cur; 1093 ++dec->cur;
637 1094
1095 U8 major = *dec->cur & MAJOR_MISC;
1096
638 sv = newSVpvn ("", 0); 1097 sv = newSVpvn ("", 0);
639 1098
640 // not very fast, and certainly not robust against illegal input
641 for (;;) 1099 for (;;)
642 { 1100 {
643 WANT (1); 1101 WANT (1);
644 1102
645 if (*dec->cur == (0xe0 | 31)) 1103 if ((*dec->cur - major) > LENGTH_EXT8)
1104 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
646 { 1105 {
647 ++dec->cur; 1106 ++dec->cur;
648 break; 1107 break;
649 } 1108 }
1109 else
1110 ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
650 1111
651 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;
652 } 1117 }
653 } 1118 }
654 else 1119 else
655 { 1120 {
656 STRLEN len = decode_uint (dec); 1121 STRLEN len = decode_uint (dec);
657 1122
658 WANT (len); 1123 WANT (len);
659 sv = newSVpvn (dec->cur, len); 1124 sv = newSVpvn (dec->cur, len);
660 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));
661 } 1130 }
662 1131
663 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
664 SvUTF8_on (sv); 1138 SvUTF8_on (sv);
1139 }
665 1140
666 return sv; 1141 return sv;
667 1142
668fail: 1143fail:
669 SvREFCNT_dec (sv); 1144 SvREFCNT_dec (sv);
671} 1146}
672 1147
673static SV * 1148static SV *
674decode_tagged (dec_t *dec) 1149decode_tagged (dec_t *dec)
675{ 1150{
1151 SV *sv = 0;
676 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:
677 SV *sv = decode_sv (dec); 1159 sv = decode_sv (dec);
1160 break;
678 1161
679 if (tag == CBOR_TAG_MAGIC) 1162 case CBOR_TAG_INDIRECTION:
680 return sv; 1163 sv = newRV_noinc (decode_sv (dec));
681 else if (tag == CBOR_TAG_PERL_OBJECT) 1164 break;
682 { 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
683 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1243 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
684 ERR ("corrupted CBOR data (non-array perl object)"); 1244 ERR ("corrupted CBOR data (non-array perl object)");
685 1245
686 AV *av = (AV *)SvRV (sv); 1246 AV *av = (AV *)SvRV (sv);
687 int len = av_len (av) + 1; 1247 int len = av_len (av) + 1;
688 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0); 1248 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
689 1249
690 if (!stash) 1250 if (!stash)
691 ERR ("cannot decode perl-object (package does not exist)"); 1251 ERR ("cannot decode perl-object (package does not exist)");
692 1252
693 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0); 1253 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
694 1254
695 if (!method) 1255 if (!method)
696 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1256 ERR ("cannot decode perl-object (package does not have a THAW method)");
697 1257
698 dSP; 1258 dSP;
699 1259
700 ENTER; SAVETMPS; PUSHMARK (SP); 1260 ENTER; SAVETMPS;
1261 PUSHMARK (SP);
701 EXTEND (SP, len + 1); 1262 EXTEND (SP, len + 1);
702 // we re-bless the reference to get overload and other niceties right 1263 // we re-bless the reference to get overload and other niceties right
703 PUSHs (*av_fetch (av, 0, 1)); 1264 PUSHs (*av_fetch (av, 0, 1));
704 PUSHs (sv_cbor); 1265 PUSHs (sv_cbor);
705 1266
706 int i; 1267 int i;
707 1268
708 for (i = 1; i < len; ++i) 1269 for (i = 1; i < len; ++i)
709 PUSHs (*av_fetch (av, i, 1)); 1270 PUSHs (*av_fetch (av, i, 1));
710 1271
711 PUTBACK; 1272 PUTBACK;
712 call_sv ((SV *)GvCV (method), G_SCALAR); 1273 call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
713 SPAGAIN; 1274 SPAGAIN;
714 1275
1276 if (SvTRUE (ERRSV))
1277 {
1278 FREETMPS; LEAVE;
1279 ERR_ERRSV;
1280 }
1281
1282 SvREFCNT_dec_NN (sv);
715 sv = SvREFCNT_inc (POPs); 1283 sv = SvREFCNT_inc (POPs);
716 1284
717 PUTBACK; 1285 PUTBACK;
718 1286
719 FREETMPS; LEAVE; 1287 FREETMPS; LEAVE;
1288 }
1289 break;
720 1290
721 return sv; 1291 default:
722 } 1292 filter:
723 else 1293 {
724 { 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 {
725 AV *av = newAV (); 1325 AV *av = newAV ();
726 av_push (av, newSVuv (tag)); 1326 av_push (av, tag_sv);
727 av_push (av, sv); 1327 av_push (av, sv);
728 1328
729 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1329 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
730 ? cbor_tagged_stash 1330 ? cbor_tagged_stash
731 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1331 : gv_stashpv ("CBOR::XS::Tagged" , 1);
732
733 return sv_bless (newRV_noinc ((SV *)av), tagged_stash); 1332 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
1333 }
1334
1335 PUTBACK;
1336
1337 FREETMPS; LEAVE;
1338 }
1339 break;
734 } 1340 }
1341
1342 return sv;
735 1343
736fail: 1344fail:
737 SvREFCNT_dec (sv); 1345 SvREFCNT_dec (sv);
738 return &PL_sv_undef; 1346 return &PL_sv_undef;
739} 1347}
741static SV * 1349static SV *
742decode_sv (dec_t *dec) 1350decode_sv (dec_t *dec)
743{ 1351{
744 WANT (1); 1352 WANT (1);
745 1353
746 switch (*dec->cur >> 5) 1354 switch (*dec->cur >> MAJOR_SHIFT)
747 { 1355 {
748 case 0: // unsigned int 1356 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
749 return newSVuv (decode_uint (dec)); 1357 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
750 case 1: // negative int 1358 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
751 return newSViv (-1 - (IV)decode_uint (dec)); 1359 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
752 case 2: // octet string 1360 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
753 return decode_str (dec, 0); 1361 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
754 case 3: // utf-8 string 1362 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
755 return decode_str (dec, 1); 1363
756 case 4: // array 1364 case MAJOR_MISC >> MAJOR_SHIFT:
757 return decode_av (dec);
758 case 5: // map
759 return decode_hv (dec);
760 case 6: // tag
761 return decode_tagged (dec);
762 case 7: // misc
763 switch (*dec->cur++ & 31) 1365 switch (*dec->cur++ & MINOR_MASK)
764 { 1366 {
765 case 20: 1367 case SIMPLE_FALSE:
766#if CBOR_SLOW 1368#if CBOR_SLOW
767 types_false = get_bool ("Types::Serialiser::false"); 1369 types_false = get_bool ("Types::Serialiser::false");
768#endif 1370#endif
769 return newSVsv (types_false); 1371 return newSVsv (types_false);
770 case 21: 1372 case SIMPLE_TRUE:
771#if CBOR_SLOW 1373#if CBOR_SLOW
772 types_true = get_bool ("Types::Serialiser::true"); 1374 types_true = get_bool ("Types::Serialiser::true");
773#endif 1375#endif
774 return newSVsv (types_true); 1376 return newSVsv (types_true);
775 case 22: 1377 case SIMPLE_NULL:
776 return newSVsv (&PL_sv_undef); 1378 return newSVsv (&PL_sv_undef);
777 case 23: 1379 case SIMPLE_UNDEF:
778#if CBOR_SLOW 1380#if CBOR_SLOW
779 types_error = get_bool ("Types::Serialiser::error"); 1381 types_error = get_bool ("Types::Serialiser::error");
780#endif 1382#endif
781 return newSVsv (types_error); 1383 return newSVsv (types_error);
782 1384
783 case 25: 1385 case MISC_FLOAT16:
784 { 1386 {
785 WANT (2); 1387 WANT (2);
786 1388
787 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1389 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
788 dec->cur += 2; 1390 dec->cur += 2;
789 1391
790 return newSVnv (ecb_binary16_to_float (fp)); 1392 return newSVnv (ecb_binary16_to_float (fp));
791 } 1393 }
792 1394
793 case 26: 1395 case MISC_FLOAT32:
794 { 1396 {
795 uint32_t fp; 1397 uint32_t fp;
796 WANT (4); 1398 WANT (4);
797 memcpy (&fp, dec->cur, 4); 1399 memcpy (&fp, dec->cur, 4);
798 dec->cur += 4; 1400 dec->cur += 4;
801 fp = ecb_bswap32 (fp); 1403 fp = ecb_bswap32 (fp);
802 1404
803 return newSVnv (ecb_binary32_to_float (fp)); 1405 return newSVnv (ecb_binary32_to_float (fp));
804 } 1406 }
805 1407
806 case 27: 1408 case MISC_FLOAT64:
807 { 1409 {
808 uint64_t fp; 1410 uint64_t fp;
809 WANT (8); 1411 WANT (8);
810 memcpy (&fp, dec->cur, 8); 1412 memcpy (&fp, dec->cur, 8);
811 dec->cur += 8; 1413 dec->cur += 8;
814 fp = ecb_bswap64 (fp); 1416 fp = ecb_bswap64 (fp);
815 1417
816 return newSVnv (ecb_binary64_to_double (fp)); 1418 return newSVnv (ecb_binary64_to_double (fp));
817 } 1419 }
818 1420
819 // 0..19 unassigned 1421 // 0..19 unassigned simple
820 // 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
821 default: 1425 default:
822 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1426 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
823 } 1427 }
824 1428
825 break; 1429 break;
826 } 1430 }
827 1431
830} 1434}
831 1435
832static SV * 1436static SV *
833decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1437decode_cbor (SV *string, CBOR *cbor, char **offset_return)
834{ 1438{
835 dec_t dec; 1439 dec_t dec = { 0 };
836 SV *sv; 1440 SV *sv;
1441 STRLEN len;
1442 char *data = SvPVbyte (string, len);
837 1443
838 /* work around bugs in 5.10 where manipulating magic values
839 * makes perl ignore the magic in subsequent accesses.
840 * also make a copy of non-PV values, to get them into a clean
841 * state (SvPV should do that, but it's buggy, see below).
842 */
843 /*SvGETMAGIC (string);*/
844 if (SvMAGICAL (string) || !SvPOK (string))
845 string = sv_2mortal (newSVsv (string));
846
847 SvUPGRADE (string, SVt_PV);
848
849 /* work around a bug in perl 5.10, which causes SvCUR to fail an
850 * assertion with -DDEBUGGING, although SvCUR is documented to
851 * return the xpv_cur field which certainly exists after upgrading.
852 * according to nicholas clark, calling SvPOK fixes this.
853 * But it doesn't fix it, so try another workaround, call SvPV_nolen
854 * and hope for the best.
855 * Damnit, SvPV_nolen still trips over yet another assertion. This
856 * assertion business is seriously broken, try yet another workaround
857 * for the broken -DDEBUGGING.
858 */
859 {
860#ifdef DEBUGGING
861 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
862#else
863 STRLEN offset = SvCUR (string);
864#endif
865
866 if (offset > cbor->max_size && cbor->max_size) 1444 if (len > cbor->max_size && cbor->max_size)
867 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",
868 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 1446 (unsigned long)len, (unsigned long)cbor->max_size);
869 }
870
871 sv_utf8_downgrade (string, 0);
872 1447
873 dec.cbor = *cbor; 1448 dec.cbor = *cbor;
874 dec.cur = (U8 *)SvPVX (string); 1449 dec.cur = (U8 *)data;
875 dec.end = (U8 *)SvEND (string); 1450 dec.end = (U8 *)data + len;
876 dec.err = 0;
877 dec.depth = 0;
878 1451
879 sv = decode_sv (&dec); 1452 sv = decode_sv (&dec);
880 1453
881 if (offset_return) 1454 if (offset_return)
882 *offset_return = dec.cur; 1455 *offset_return = dec.cur;
885 if (dec.cur != dec.end && !dec.err) 1458 if (dec.cur != dec.end && !dec.err)
886 dec.err = "garbage after CBOR object"; 1459 dec.err = "garbage after CBOR object";
887 1460
888 if (dec.err) 1461 if (dec.err)
889 { 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
890 SvREFCNT_dec (sv); 1474 SvREFCNT_dec_NN (sv);
1475
1476 if (dec.err_sv)
1477 sv_2mortal (dec.err_sv);
1478
891 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);
892 } 1480 }
893 1481
894 sv = sv_2mortal (sv); 1482 sv = sv_2mortal (sv);
895 1483
896 return sv; 1484 return sv;
897} 1485}
898 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
899///////////////////////////////////////////////////////////////////////////// 1612/////////////////////////////////////////////////////////////////////////////
900// XS interface functions 1613// XS interface functions
901 1614
902MODULE = CBOR::XS PACKAGE = CBOR::XS 1615MODULE = CBOR::XS PACKAGE = CBOR::XS
903 1616
911 1624
912 types_true = get_bool ("Types::Serialiser::true" ); 1625 types_true = get_bool ("Types::Serialiser::true" );
913 types_false = get_bool ("Types::Serialiser::false"); 1626 types_false = get_bool ("Types::Serialiser::false");
914 types_error = get_bool ("Types::Serialiser::error"); 1627 types_error = get_bool ("Types::Serialiser::error");
915 1628
1629 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1630
916 sv_cbor = newSVpv ("CBOR", 0); 1631 sv_cbor = newSVpv ("CBOR", 0);
917 SvREADONLY_on (sv_cbor); 1632 SvREADONLY_on (sv_cbor);
1633
1634 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
918} 1635}
919 1636
920PROTOTYPES: DISABLE 1637PROTOTYPES: DISABLE
921 1638
922void CLONE (...) 1639void CLONE (...)
940 1657
941void shrink (CBOR *self, int enable = 1) 1658void shrink (CBOR *self, int enable = 1)
942 ALIAS: 1659 ALIAS:
943 shrink = F_SHRINK 1660 shrink = F_SHRINK
944 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
945 PPCODE: 1669 PPCODE:
946{ 1670{
947 if (enable) 1671 if (enable)
948 self->flags |= ix; 1672 self->flags |= ix;
949 else 1673 else
954 1678
955void get_shrink (CBOR *self) 1679void get_shrink (CBOR *self)
956 ALIAS: 1680 ALIAS:
957 get_shrink = F_SHRINK 1681 get_shrink = F_SHRINK
958 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
959 PPCODE: 1690 PPCODE:
960 XPUSHs (boolSV (self->flags & ix)); 1691 XPUSHs (boolSV (self->flags & ix));
961 1692
962void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1693void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
963 PPCODE: 1694 PPCODE:
979 CODE: 1710 CODE:
980 RETVAL = self->max_size; 1711 RETVAL = self->max_size;
981 OUTPUT: 1712 OUTPUT:
982 RETVAL 1713 RETVAL
983 1714
984#if 0 //TODO 1715void filter (CBOR *self, SV *filter = 0)
985
986void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
987 PPCODE: 1716 PPCODE:
988{
989 SvREFCNT_dec (self->cb_object); 1717 SvREFCNT_dec (self->filter);
990 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0; 1718 self->filter = filter ? newSVsv (filter) : filter;
991
992 XPUSHs (ST (0)); 1719 XPUSHs (ST (0));
993}
994 1720
995void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef) 1721SV *get_filter (CBOR *self)
996 PPCODE: 1722 CODE:
997{ 1723 RETVAL = self->filter ? self->filter : NEWSV (0, 0);
998 if (!self->cb_sk_object) 1724 OUTPUT:
999 self->cb_sk_object = newHV (); 1725 RETVAL
1000
1001 if (SvOK (cb))
1002 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1003 else
1004 {
1005 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1006
1007 if (!HvKEYS (self->cb_sk_object))
1008 {
1009 SvREFCNT_dec (self->cb_sk_object);
1010 self->cb_sk_object = 0;
1011 }
1012 }
1013
1014 XPUSHs (ST (0));
1015}
1016
1017#endif
1018 1726
1019void encode (CBOR *self, SV *scalar) 1727void encode (CBOR *self, SV *scalar)
1020 PPCODE: 1728 PPCODE:
1021 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1729 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1022 XPUSHs (scalar); 1730 XPUSHs (scalar);
1035 EXTEND (SP, 2); 1743 EXTEND (SP, 2);
1036 PUSHs (sv); 1744 PUSHs (sv);
1037 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1745 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1038} 1746}
1039 1747
1040#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}
1041 1799
1042void DESTROY (CBOR *self) 1800void DESTROY (CBOR *self)
1043 CODE: 1801 PPCODE:
1044 SvREFCNT_dec (self->cb_sk_object); 1802 cbor_free (self);
1045 SvREFCNT_dec (self->cb_object);
1046
1047#endif
1048 1803
1049PROTOTYPES: ENABLE 1804PROTOTYPES: ENABLE
1050 1805
1051void encode_cbor (SV *scalar) 1806void encode_cbor (SV *scalar)
1807 ALIAS:
1808 encode_cbor = 0
1809 encode_cbor_sharing = F_ALLOW_SHARING
1052 PPCODE: 1810 PPCODE:
1053{ 1811{
1054 CBOR cbor; 1812 CBOR cbor;
1055 cbor_init (&cbor); 1813 cbor_init (&cbor);
1814 cbor.flags |= ix;
1056 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1815 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1057 XPUSHs (scalar); 1816 XPUSHs (scalar);
1058} 1817}
1059 1818
1060void decode_cbor (SV *cborstr) 1819void decode_cbor (SV *cborstr)
1064 cbor_init (&cbor); 1823 cbor_init (&cbor);
1065 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1824 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1066 XPUSHs (cborstr); 1825 XPUSHs (cborstr);
1067} 1826}
1068 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