ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/CBOR-XS/XS.xs
(Generate patch)

Comparing cvsroot/CBOR-XS/XS.xs (file contents):
Revision 1.8 by root, Sun Oct 27 10:12:01 2013 UTC vs.
Revision 1.44 by root, Tue Feb 18 22:12:12 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines