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.7 by root, Sat Oct 26 23:02:55 2013 UTC vs.
Revision 1.40 by root, Tue Dec 10 13:54:40 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines