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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines