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.58 by root, Fri Nov 25 13:27:29 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines