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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines