… | |
… | |
9 | #include <limits.h> |
9 | #include <limits.h> |
10 | #include <float.h> |
10 | #include <float.h> |
11 | |
11 | |
12 | #include "ecb.h" |
12 | #include "ecb.h" |
13 | |
13 | |
|
|
14 | // compatibility with perl <5.18 |
|
|
15 | #ifndef HvNAMELEN_get |
|
|
16 | # define HvNAMELEN_get(hv) strlen (HvNAME (hv)) |
|
|
17 | #endif |
|
|
18 | #ifndef HvNAMELEN |
|
|
19 | # define HvNAMELEN(hv) HvNAMELEN_get (hv) |
|
|
20 | #endif |
|
|
21 | #ifndef HvNAMEUTF8 |
|
|
22 | # define HvNAMEUTF8(hv) 0 |
|
|
23 | #endif |
|
|
24 | |
|
|
25 | // known tags |
|
|
26 | enum cbor_tag |
|
|
27 | { |
|
|
28 | // inofficial extensions (pending iana registration) |
|
|
29 | CBOR_TAG_PERL_OBJECT = 256, |
|
|
30 | CBOR_TAG_GENERIC_OBJECT = 257, |
|
|
31 | |
|
|
32 | // rfc7049 |
|
|
33 | CBOR_TAG_DATETIME = 0, // rfc4287, utf-8 |
|
|
34 | CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any |
|
|
35 | CBOR_TAG_POS_BIGNUM = 2, // byte string |
|
|
36 | CBOR_TAG_NEG_BIGNUM = 3, // byte string |
|
|
37 | CBOR_TAG_DECIMAL = 4, // decimal fraction, array |
|
|
38 | CBOR_TAG_BIGFLOAT = 5, // array |
|
|
39 | |
|
|
40 | CBOR_TAG_CONV_B64U = 21, // base64url, any |
|
|
41 | CBOR_TAG_CONV_B64 = 22, // base64, any |
|
|
42 | CBOR_TAG_CONV_HEX = 23, // base16, any |
|
|
43 | CBOR_TAG_CBOR = 24, // embedded cbor, byte string |
|
|
44 | |
|
|
45 | CBOR_TAG_URI = 32, // URI rfc3986, utf-8 |
|
|
46 | CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8 |
|
|
47 | CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8 |
|
|
48 | CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8 |
|
|
49 | CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 |
|
|
50 | |
|
|
51 | CBOR_TAG_MAGIC = 55799 // self-describe cbor |
|
|
52 | }; |
|
|
53 | |
14 | #define F_SHRINK 0x00000200UL |
54 | #define F_SHRINK 0x00000200UL |
15 | #define F_ALLOW_UNKNOWN 0x00002000UL |
55 | #define F_ALLOW_UNKNOWN 0x00002000UL |
16 | |
56 | |
17 | #define INIT_SIZE 32 // initial scalar size to be allocated |
57 | #define INIT_SIZE 32 // initial scalar size to be allocated |
18 | |
58 | |
19 | #define SB do { |
59 | #define SB do { |
20 | #define SE } while (0) |
60 | #define SE } while (0) |
21 | |
|
|
22 | #if __GNUC__ >= 3 |
|
|
23 | # define expect(expr,value) __builtin_expect ((expr), (value)) |
|
|
24 | # define INLINE static inline |
|
|
25 | #else |
|
|
26 | # define expect(expr,value) (expr) |
|
|
27 | # define INLINE static |
|
|
28 | #endif |
|
|
29 | |
|
|
30 | #define expect_false(expr) expect ((expr) != 0, 0) |
|
|
31 | #define expect_true(expr) expect ((expr) != 0, 1) |
|
|
32 | |
61 | |
33 | #define IN_RANGE_INC(type,val,beg,end) \ |
62 | #define IN_RANGE_INC(type,val,beg,end) \ |
34 | ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ |
63 | ((unsigned type)((unsigned type)(val) - (unsigned type)(beg)) \ |
35 | <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) |
64 | <= (unsigned type)((unsigned type)(end) - (unsigned type)(beg))) |
36 | |
65 | |
… | |
… | |
42 | #else |
71 | #else |
43 | # define CBOR_SLOW 0 |
72 | # define CBOR_SLOW 0 |
44 | # define CBOR_STASH cbor_stash |
73 | # define CBOR_STASH cbor_stash |
45 | #endif |
74 | #endif |
46 | |
75 | |
47 | static HV *cbor_stash, *cbor_boolean_stash; // CBOR::XS:: |
76 | static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS:: |
48 | static SV *cbor_true, *cbor_false; |
77 | static SV *types_true, *types_false, *types_error, *sv_cbor; |
49 | |
78 | |
50 | typedef struct { |
79 | typedef struct { |
51 | U32 flags; |
80 | U32 flags; |
52 | U32 max_depth; |
81 | U32 max_depth; |
53 | STRLEN max_size; |
82 | STRLEN max_size; |
54 | |
|
|
55 | SV *cb_object; |
|
|
56 | HV *cb_sk_object; |
|
|
57 | } CBOR; |
83 | } CBOR; |
58 | |
84 | |
59 | INLINE void |
85 | ecb_inline void |
60 | cbor_init (CBOR *cbor) |
86 | cbor_init (CBOR *cbor) |
61 | { |
87 | { |
62 | Zero (cbor, 1, CBOR); |
88 | Zero (cbor, 1, CBOR); |
63 | cbor->max_depth = 512; |
89 | cbor->max_depth = 512; |
64 | } |
90 | } |
65 | |
91 | |
66 | ///////////////////////////////////////////////////////////////////////////// |
92 | ///////////////////////////////////////////////////////////////////////////// |
67 | // utility functions |
93 | // utility functions |
68 | |
94 | |
69 | INLINE SV * |
95 | ecb_inline SV * |
70 | get_bool (const char *name) |
96 | get_bool (const char *name) |
71 | { |
97 | { |
72 | SV *sv = get_sv (name, 1); |
98 | SV *sv = get_sv (name, 1); |
73 | |
99 | |
74 | SvREADONLY_on (sv); |
100 | SvREADONLY_on (sv); |
75 | SvREADONLY_on (SvRV (sv)); |
101 | SvREADONLY_on (SvRV (sv)); |
76 | |
102 | |
77 | return sv; |
103 | return sv; |
78 | } |
104 | } |
79 | |
105 | |
80 | INLINE void |
106 | ecb_inline void |
81 | shrink (SV *sv) |
107 | shrink (SV *sv) |
82 | { |
108 | { |
83 | sv_utf8_downgrade (sv, 1); |
109 | sv_utf8_downgrade (sv, 1); |
84 | |
110 | |
85 | if (SvLEN (sv) > SvCUR (sv) + 1) |
111 | if (SvLEN (sv) > SvCUR (sv) + 1) |
… | |
… | |
108 | SV *sv; // result scalar |
134 | SV *sv; // result scalar |
109 | CBOR cbor; |
135 | CBOR cbor; |
110 | U32 depth; // recursion level |
136 | U32 depth; // recursion level |
111 | } enc_t; |
137 | } enc_t; |
112 | |
138 | |
113 | INLINE void |
139 | ecb_inline void |
114 | need (enc_t *enc, STRLEN len) |
140 | need (enc_t *enc, STRLEN len) |
115 | { |
141 | { |
116 | if (expect_false (enc->cur + len >= enc->end)) |
142 | if (ecb_expect_false (enc->cur + len >= enc->end)) |
117 | { |
143 | { |
118 | STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); |
144 | STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); |
119 | SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); |
145 | SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); |
120 | enc->cur = SvPVX (enc->sv) + cur; |
146 | enc->cur = SvPVX (enc->sv) + cur; |
121 | enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; |
147 | enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; |
122 | } |
148 | } |
123 | } |
149 | } |
124 | |
150 | |
125 | INLINE void |
151 | ecb_inline void |
126 | encode_ch (enc_t *enc, char ch) |
152 | encode_ch (enc_t *enc, char ch) |
127 | { |
153 | { |
128 | need (enc, 1); |
154 | need (enc, 1); |
129 | *enc->cur++ = ch; |
155 | *enc->cur++ = ch; |
130 | } |
156 | } |
… | |
… | |
224 | if (HeKLEN (he) == HEf_SVKEY) |
250 | if (HeKLEN (he) == HEf_SVKEY) |
225 | encode_sv (enc, HeSVKEY (he)); |
251 | encode_sv (enc, HeSVKEY (he)); |
226 | else |
252 | else |
227 | encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); |
253 | encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); |
228 | |
254 | |
229 | encode_sv (enc, expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); |
255 | encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); |
230 | } |
256 | } |
231 | |
257 | |
232 | if (mg) |
258 | if (mg) |
233 | encode_ch (enc, 0xe0 | 31); |
259 | encode_ch (enc, 0xe0 | 31); |
234 | |
260 | |
… | |
… | |
242 | svtype svt; |
268 | svtype svt; |
243 | |
269 | |
244 | SvGETMAGIC (sv); |
270 | SvGETMAGIC (sv); |
245 | svt = SvTYPE (sv); |
271 | svt = SvTYPE (sv); |
246 | |
272 | |
247 | if (expect_false (SvOBJECT (sv))) |
273 | if (ecb_expect_false (SvOBJECT (sv))) |
248 | { |
274 | { |
249 | HV *stash = !CBOR_SLOW || cbor_boolean_stash |
275 | HV *boolean_stash = !CBOR_SLOW || types_boolean_stash |
250 | ? cbor_boolean_stash |
276 | ? types_boolean_stash |
|
|
277 | : gv_stashpv ("Types::Serialiser::Boolean", 1); |
|
|
278 | HV *error_stash = !CBOR_SLOW || types_error_stash |
|
|
279 | ? types_error_stash |
|
|
280 | : gv_stashpv ("Types::Serialiser::Error", 1); |
|
|
281 | HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash |
|
|
282 | ? cbor_tagged_stash |
251 | : gv_stashpv ("CBOR::XS::Boolean", 1); |
283 | : gv_stashpv ("CBOR::XS::Tagged" , 1); |
252 | |
284 | |
253 | if (SvSTASH (sv) == stash) |
285 | HV *stash = SvSTASH (sv); |
|
|
286 | GV *method; |
|
|
287 | |
|
|
288 | if (stash == boolean_stash) |
254 | encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); |
289 | encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); |
|
|
290 | else if (stash == error_stash) |
|
|
291 | encode_ch (enc, 0xe0 | 23); |
|
|
292 | else if (stash == tagged_stash) |
|
|
293 | { |
|
|
294 | if (svt != SVt_PVAV) |
|
|
295 | croak ("encountered CBOR::XS::Tagged object that isn't an array"); |
|
|
296 | |
|
|
297 | encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); |
|
|
298 | encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); |
|
|
299 | } |
|
|
300 | else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) |
|
|
301 | { |
|
|
302 | dSP; |
|
|
303 | |
|
|
304 | ENTER; SAVETMPS; PUSHMARK (SP); |
|
|
305 | // we re-bless the reference to get overload and other niceties right |
|
|
306 | XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
|
|
307 | |
|
|
308 | PUTBACK; |
|
|
309 | // G_SCALAR ensures that return value is 1 |
|
|
310 | call_sv ((SV *)GvCV (method), G_SCALAR); |
|
|
311 | SPAGAIN; |
|
|
312 | |
|
|
313 | // catch this surprisingly common error |
|
|
314 | if (SvROK (TOPs) && SvRV (TOPs) == sv) |
|
|
315 | croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash)); |
|
|
316 | |
|
|
317 | encode_sv (enc, POPs); |
|
|
318 | |
|
|
319 | PUTBACK; |
|
|
320 | |
|
|
321 | FREETMPS; LEAVE; |
|
|
322 | } |
|
|
323 | else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) |
|
|
324 | { |
|
|
325 | dSP; |
|
|
326 | |
|
|
327 | ENTER; SAVETMPS; PUSHMARK (SP); |
|
|
328 | EXTEND (SP, 2); |
|
|
329 | // we re-bless the reference to get overload and other niceties right |
|
|
330 | PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
|
|
331 | PUSHs (sv_cbor); |
|
|
332 | |
|
|
333 | PUTBACK; |
|
|
334 | int count = call_sv ((SV *)GvCV (method), G_ARRAY); |
|
|
335 | SPAGAIN; |
|
|
336 | |
|
|
337 | // catch this surprisingly common error |
|
|
338 | if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) |
|
|
339 | croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); |
|
|
340 | |
|
|
341 | encode_uint (enc, 0xc0, CBOR_TAG_PERL_OBJECT); |
|
|
342 | encode_uint (enc, 0x80, count + 1); |
|
|
343 | encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); |
|
|
344 | |
|
|
345 | while (count) |
|
|
346 | encode_sv (enc, SP[1 - count--]); |
|
|
347 | |
|
|
348 | PUTBACK; |
|
|
349 | |
|
|
350 | FREETMPS; LEAVE; |
|
|
351 | } |
255 | else |
352 | else |
256 | { |
|
|
257 | #if 0 //TODO |
|
|
258 | if (enc->cbor.flags & F_CONV_BLESSED) |
|
|
259 | { |
|
|
260 | // we re-bless the reference to get overload and other niceties right |
|
|
261 | GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0); |
|
|
262 | |
|
|
263 | if (to_cbor) |
|
|
264 | { |
|
|
265 | dSP; |
|
|
266 | |
|
|
267 | ENTER; SAVETMPS; PUSHMARK (SP); |
|
|
268 | XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); |
|
|
269 | |
|
|
270 | // calling with G_SCALAR ensures that we always get a 1 return value |
|
|
271 | PUTBACK; |
|
|
272 | call_sv ((SV *)GvCV (to_cbor), G_SCALAR); |
|
|
273 | SPAGAIN; |
|
|
274 | |
|
|
275 | // catch this surprisingly common error |
|
|
276 | if (SvROK (TOPs) && SvRV (TOPs) == sv) |
|
|
277 | croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv))); |
|
|
278 | |
|
|
279 | sv = POPs; |
|
|
280 | PUTBACK; |
|
|
281 | |
|
|
282 | encode_sv (enc, sv); |
|
|
283 | |
|
|
284 | FREETMPS; LEAVE; |
|
|
285 | } |
|
|
286 | else if (enc->cbor.flags & F_ALLOW_BLESSED) |
|
|
287 | encode_str (enc, "null", 4, 0); |
|
|
288 | else |
|
|
289 | croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it", |
353 | croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it", |
290 | SvPV_nolen (sv_2mortal (newRV_inc (sv)))); |
|
|
291 | } |
|
|
292 | else if (enc->cbor.flags & F_ALLOW_BLESSED) |
|
|
293 | encode_str (enc, "null", 4, 0); |
|
|
294 | else |
|
|
295 | croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled", |
|
|
296 | SvPV_nolen (sv_2mortal (newRV_inc (sv)))); |
354 | SvPV_nolen (sv_2mortal (newRV_inc (sv)))); |
297 | #endif |
|
|
298 | } |
|
|
299 | } |
355 | } |
300 | else if (svt == SVt_PVHV) |
356 | else if (svt == SVt_PVHV) |
301 | encode_hv (enc, (HV *)sv); |
357 | encode_hv (enc, (HV *)sv); |
302 | else if (svt == SVt_PVAV) |
358 | else if (svt == SVt_PVAV) |
303 | encode_av (enc, (AV *)sv); |
359 | encode_av (enc, (AV *)sv); |
… | |
… | |
328 | { |
384 | { |
329 | double nv = SvNVX (sv); |
385 | double nv = SvNVX (sv); |
330 | |
386 | |
331 | need (enc, 9); |
387 | need (enc, 9); |
332 | |
388 | |
333 | if (expect_false (nv == (U32)nv)) |
389 | if (ecb_expect_false (nv == (U32)nv)) |
334 | encode_uint (enc, 0x00, (U32)nv); |
390 | encode_uint (enc, 0x00, (U32)nv); |
335 | //TODO: maybe I32? |
391 | //TODO: maybe I32? |
336 | else if (expect_false (nv == (float)nv)) |
392 | else if (ecb_expect_false (nv == (float)nv)) |
337 | { |
393 | { |
338 | uint32_t fp = ecb_float_to_binary32 (nv); |
394 | uint32_t fp = ecb_float_to_binary32 (nv); |
339 | |
395 | |
340 | *enc->cur++ = 0xe0 | 26; |
396 | *enc->cur++ = 0xe0 | 26; |
341 | |
397 | |
… | |
… | |
429 | U32 maxdepth; // recursion depth limit |
485 | U32 maxdepth; // recursion depth limit |
430 | } dec_t; |
486 | } dec_t; |
431 | |
487 | |
432 | #define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE |
488 | #define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE |
433 | |
489 | |
434 | #define WANT(len) if (expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data"); |
490 | #define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") |
435 | |
491 | |
436 | #define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) |
492 | #define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) |
437 | #define DEC_DEC_DEPTH --dec->depth |
493 | #define DEC_DEC_DEPTH --dec->depth |
438 | |
494 | |
439 | static UV |
495 | static UV |
… | |
… | |
553 | |
609 | |
554 | SV *k = decode_sv (dec); |
610 | SV *k = decode_sv (dec); |
555 | SV *v = decode_sv (dec); |
611 | SV *v = decode_sv (dec); |
556 | |
612 | |
557 | hv_store_ent (hv, k, v, 0); |
613 | hv_store_ent (hv, k, v, 0); |
|
|
614 | SvREFCNT_dec (k); |
558 | } |
615 | } |
559 | } |
616 | } |
560 | else |
617 | else |
561 | { |
618 | { |
562 | int len = decode_uint (dec); |
619 | int len = decode_uint (dec); |
… | |
… | |
565 | { |
622 | { |
566 | SV *k = decode_sv (dec); |
623 | SV *k = decode_sv (dec); |
567 | SV *v = decode_sv (dec); |
624 | SV *v = decode_sv (dec); |
568 | |
625 | |
569 | hv_store_ent (hv, k, v, 0); |
626 | hv_store_ent (hv, k, v, 0); |
|
|
627 | SvREFCNT_dec (k); |
570 | } |
628 | } |
571 | } |
629 | } |
572 | |
630 | |
573 | DEC_DEC_DEPTH; |
631 | DEC_DEC_DEPTH; |
574 | return newRV_noinc ((SV *)hv); |
632 | return newRV_noinc ((SV *)hv); |
575 | |
|
|
576 | #if 0 |
|
|
577 | SV *sv; |
|
|
578 | HV *hv = newHV (); |
|
|
579 | |
|
|
580 | DEC_INC_DEPTH; |
|
|
581 | decode_ws (dec); |
|
|
582 | |
|
|
583 | for (;;) |
|
|
584 | { |
|
|
585 | // heuristic: assume that |
|
|
586 | // a) decode_str + hv_store_ent are abysmally slow. |
|
|
587 | // b) most hash keys are short, simple ascii text. |
|
|
588 | // => try to "fast-match" such strings to avoid |
|
|
589 | // the overhead of decode_str + hv_store_ent. |
|
|
590 | { |
|
|
591 | SV *value; |
|
|
592 | char *p = dec->cur; |
|
|
593 | char *e = p + 24; // only try up to 24 bytes |
|
|
594 | |
|
|
595 | for (;;) |
|
|
596 | { |
|
|
597 | // the >= 0x80 is false on most architectures |
|
|
598 | if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\') |
|
|
599 | { |
|
|
600 | // slow path, back up and use decode_str |
|
|
601 | SV *key = decode_str (dec); |
|
|
602 | if (!key) |
|
|
603 | goto fail; |
|
|
604 | |
|
|
605 | decode_ws (dec); EXPECT_CH (':'); |
|
|
606 | |
|
|
607 | decode_ws (dec); |
|
|
608 | value = decode_sv (dec); |
|
|
609 | if (!value) |
|
|
610 | { |
|
|
611 | SvREFCNT_dec (key); |
|
|
612 | goto fail; |
|
|
613 | } |
|
|
614 | |
|
|
615 | hv_store_ent (hv, key, value, 0); |
|
|
616 | SvREFCNT_dec (key); |
|
|
617 | |
|
|
618 | break; |
|
|
619 | } |
|
|
620 | else if (*p == '"') |
|
|
621 | { |
|
|
622 | // fast path, got a simple key |
|
|
623 | char *key = dec->cur; |
|
|
624 | int len = p - key; |
|
|
625 | dec->cur = p + 1; |
|
|
626 | |
|
|
627 | decode_ws (dec); EXPECT_CH (':'); |
|
|
628 | |
|
|
629 | decode_ws (dec); |
|
|
630 | value = decode_sv (dec); |
|
|
631 | if (!value) |
|
|
632 | goto fail; |
|
|
633 | |
|
|
634 | hv_store (hv, key, len, value, 0); |
|
|
635 | |
|
|
636 | break; |
|
|
637 | } |
|
|
638 | |
|
|
639 | ++p; |
|
|
640 | } |
|
|
641 | } |
|
|
642 | |
|
|
643 | decode_ws (dec); |
|
|
644 | |
|
|
645 | if (*dec->cur == '}') |
|
|
646 | { |
|
|
647 | ++dec->cur; |
|
|
648 | break; |
|
|
649 | } |
|
|
650 | |
|
|
651 | if (*dec->cur != ',') |
|
|
652 | ERR (", or } expected while parsing object/hash"); |
|
|
653 | |
|
|
654 | ++dec->cur; |
|
|
655 | |
|
|
656 | decode_ws (dec); |
|
|
657 | |
|
|
658 | if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED) |
|
|
659 | { |
|
|
660 | ++dec->cur; |
|
|
661 | break; |
|
|
662 | } |
|
|
663 | } |
|
|
664 | |
|
|
665 | DEC_DEC_DEPTH; |
|
|
666 | sv = newRV_noinc ((SV *)hv); |
|
|
667 | |
|
|
668 | // check filter callbacks |
|
|
669 | if (dec->cbor.flags & F_HOOK) |
|
|
670 | { |
|
|
671 | if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1) |
|
|
672 | { |
|
|
673 | HE *cb, *he; |
|
|
674 | |
|
|
675 | hv_iterinit (hv); |
|
|
676 | he = hv_iternext (hv); |
|
|
677 | hv_iterinit (hv); |
|
|
678 | |
|
|
679 | // the next line creates a mortal sv each time its called. |
|
|
680 | // might want to optimise this for common cases. |
|
|
681 | cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0); |
|
|
682 | |
|
|
683 | if (cb) |
|
|
684 | { |
|
|
685 | dSP; |
|
|
686 | int count; |
|
|
687 | |
|
|
688 | ENTER; SAVETMPS; PUSHMARK (SP); |
|
|
689 | XPUSHs (HeVAL (he)); |
|
|
690 | sv_2mortal (sv); |
|
|
691 | |
|
|
692 | PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN; |
|
|
693 | |
|
|
694 | if (count == 1) |
|
|
695 | { |
|
|
696 | sv = newSVsv (POPs); |
|
|
697 | FREETMPS; LEAVE; |
|
|
698 | return sv; |
|
|
699 | } |
|
|
700 | |
|
|
701 | SvREFCNT_inc (sv); |
|
|
702 | FREETMPS; LEAVE; |
|
|
703 | } |
|
|
704 | } |
|
|
705 | |
|
|
706 | if (dec->cbor.cb_object) |
|
|
707 | { |
|
|
708 | dSP; |
|
|
709 | int count; |
|
|
710 | |
|
|
711 | ENTER; SAVETMPS; PUSHMARK (SP); |
|
|
712 | XPUSHs (sv_2mortal (sv)); |
|
|
713 | |
|
|
714 | PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN; |
|
|
715 | |
|
|
716 | if (count == 1) |
|
|
717 | { |
|
|
718 | sv = newSVsv (POPs); |
|
|
719 | FREETMPS; LEAVE; |
|
|
720 | return sv; |
|
|
721 | } |
|
|
722 | |
|
|
723 | SvREFCNT_inc (sv); |
|
|
724 | FREETMPS; LEAVE; |
|
|
725 | } |
|
|
726 | } |
|
|
727 | |
|
|
728 | return sv; |
|
|
729 | #endif |
|
|
730 | |
633 | |
731 | fail: |
634 | fail: |
732 | SvREFCNT_dec (hv); |
635 | SvREFCNT_dec (hv); |
733 | DEC_DEC_DEPTH; |
636 | DEC_DEC_DEPTH; |
734 | return &PL_sv_undef; |
637 | return &PL_sv_undef; |
735 | } |
638 | } |
736 | |
639 | |
737 | static SV * |
640 | static SV * |
738 | decode_str (dec_t *dec, int utf8) |
641 | decode_str (dec_t *dec, int utf8) |
739 | { |
642 | { |
740 | SV *sv; |
643 | SV *sv = 0; |
741 | |
644 | |
742 | if ((*dec->cur & 31) == 31) |
645 | if ((*dec->cur & 31) == 31) |
743 | { |
646 | { |
744 | ++dec->cur; |
647 | ++dec->cur; |
745 | |
648 | |
… | |
… | |
754 | { |
657 | { |
755 | ++dec->cur; |
658 | ++dec->cur; |
756 | break; |
659 | break; |
757 | } |
660 | } |
758 | |
661 | |
759 | SV *sv2 = decode_sv (dec); |
|
|
760 | sv_catsv (sv, sv2); |
662 | sv_catsv (sv, decode_sv (dec)); |
761 | } |
663 | } |
762 | } |
664 | } |
763 | else |
665 | else |
764 | { |
666 | { |
765 | STRLEN len = decode_uint (dec); |
667 | STRLEN len = decode_uint (dec); |
… | |
… | |
773 | SvUTF8_on (sv); |
675 | SvUTF8_on (sv); |
774 | |
676 | |
775 | return sv; |
677 | return sv; |
776 | |
678 | |
777 | fail: |
679 | fail: |
|
|
680 | SvREFCNT_dec (sv); |
778 | return &PL_sv_undef; |
681 | return &PL_sv_undef; |
779 | } |
682 | } |
780 | |
683 | |
781 | static SV * |
684 | static SV * |
782 | decode_tagged (dec_t *dec) |
685 | decode_tagged (dec_t *dec) |
783 | { |
686 | { |
784 | UV tag = decode_uint (dec); |
687 | UV tag = decode_uint (dec); |
785 | SV *sv = decode_sv (dec); |
688 | SV *sv = decode_sv (dec); |
786 | |
689 | |
787 | if (tag == 55799) // 2.4.5 Self-Describe CBOR |
690 | if (tag == CBOR_TAG_MAGIC) |
788 | return sv; |
691 | return sv; |
|
|
692 | else if (tag == CBOR_TAG_PERL_OBJECT) |
|
|
693 | { |
|
|
694 | if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) |
|
|
695 | ERR ("corrupted CBOR data (non-array perl object)"); |
789 | |
696 | |
|
|
697 | AV *av = (AV *)SvRV (sv); |
|
|
698 | int len = av_len (av) + 1; |
|
|
699 | HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0); |
|
|
700 | |
|
|
701 | if (!stash) |
|
|
702 | ERR ("cannot decode perl-object (package does not exist)"); |
|
|
703 | |
|
|
704 | GV *method = gv_fetchmethod_autoload (stash, "THAW", 0); |
|
|
705 | |
|
|
706 | if (!method) |
|
|
707 | ERR ("cannot decode perl-object (package does not have a THAW method)"); |
|
|
708 | |
|
|
709 | dSP; |
|
|
710 | |
|
|
711 | ENTER; SAVETMPS; PUSHMARK (SP); |
|
|
712 | EXTEND (SP, len + 1); |
|
|
713 | // we re-bless the reference to get overload and other niceties right |
|
|
714 | PUSHs (*av_fetch (av, 0, 1)); |
|
|
715 | PUSHs (sv_cbor); |
|
|
716 | |
|
|
717 | int i; |
|
|
718 | |
|
|
719 | for (i = 1; i < len; ++i) |
|
|
720 | PUSHs (*av_fetch (av, i, 1)); |
|
|
721 | |
|
|
722 | PUTBACK; |
|
|
723 | call_sv ((SV *)GvCV (method), G_SCALAR); |
|
|
724 | SPAGAIN; |
|
|
725 | |
|
|
726 | SvREFCNT_dec (sv); |
|
|
727 | sv = SvREFCNT_inc (POPs); |
|
|
728 | |
|
|
729 | PUTBACK; |
|
|
730 | |
|
|
731 | FREETMPS; LEAVE; |
|
|
732 | |
|
|
733 | return sv; |
|
|
734 | } |
|
|
735 | else |
|
|
736 | { |
790 | AV *av = newAV (); |
737 | AV *av = newAV (); |
791 | av_push (av, newSVuv (tag)); |
738 | av_push (av, newSVuv (tag)); |
792 | av_push (av, sv); |
739 | av_push (av, sv); |
793 | return newRV_noinc ((SV *)av); |
740 | |
|
|
741 | HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash |
|
|
742 | ? cbor_tagged_stash |
|
|
743 | : gv_stashpv ("CBOR::XS::Tagged" , 1); |
|
|
744 | |
|
|
745 | return sv_bless (newRV_noinc ((SV *)av), tagged_stash); |
|
|
746 | } |
|
|
747 | |
|
|
748 | fail: |
|
|
749 | SvREFCNT_dec (sv); |
|
|
750 | return &PL_sv_undef; |
794 | } |
751 | } |
795 | |
752 | |
796 | static SV * |
753 | static SV * |
797 | decode_sv (dec_t *dec) |
754 | decode_sv (dec_t *dec) |
798 | { |
755 | { |
799 | WANT (1); |
756 | WANT (1); |
800 | |
757 | |
801 | switch (*dec->cur >> 5) |
758 | switch (*dec->cur >> 5) |
802 | { |
759 | { |
803 | case 0: // unsigned int |
760 | case 0: // unsigned int |
804 | //TODO: 64 bit values on 3 2bit perls |
|
|
805 | return newSVuv (decode_uint (dec)); |
761 | return newSVuv (decode_uint (dec)); |
806 | case 1: // negative int |
762 | case 1: // negative int |
807 | return newSViv (-1 - (IV)decode_uint (dec)); |
763 | return newSViv (-1 - (IV)decode_uint (dec)); |
808 | case 2: // octet string |
764 | case 2: // octet string |
809 | return decode_str (dec, 0); |
765 | return decode_str (dec, 0); |
… | |
… | |
818 | case 7: // misc |
774 | case 7: // misc |
819 | switch (*dec->cur++ & 31) |
775 | switch (*dec->cur++ & 31) |
820 | { |
776 | { |
821 | case 20: |
777 | case 20: |
822 | #if CBOR_SLOW |
778 | #if CBOR_SLOW |
823 | cbor_false = get_bool ("CBOR::XS::false"); |
779 | types_false = get_bool ("Types::Serialiser::false"); |
824 | #endif |
780 | #endif |
825 | return newSVsv (cbor_false); |
781 | return newSVsv (types_false); |
826 | case 21: |
782 | case 21: |
827 | #if CBOR_SLOW |
783 | #if CBOR_SLOW |
828 | cbor_true = get_bool ("CBOR::XS::true"); |
784 | types_true = get_bool ("Types::Serialiser::true"); |
829 | #endif |
785 | #endif |
830 | return newSVsv (cbor_true); |
786 | return newSVsv (types_true); |
831 | case 22: |
787 | case 22: |
832 | return newSVsv (&PL_sv_undef); |
788 | return newSVsv (&PL_sv_undef); |
|
|
789 | case 23: |
|
|
790 | #if CBOR_SLOW |
|
|
791 | types_error = get_bool ("Types::Serialiser::error"); |
|
|
792 | #endif |
|
|
793 | return newSVsv (types_error); |
833 | |
794 | |
834 | case 25: |
795 | case 25: |
835 | { |
796 | { |
836 | WANT (2); |
797 | WANT (2); |
837 | |
798 | |
… | |
… | |
873 | ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); |
834 | ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); |
874 | } |
835 | } |
875 | |
836 | |
876 | break; |
837 | break; |
877 | } |
838 | } |
878 | #if 0 |
|
|
879 | switch (*dec->cur) |
|
|
880 | { |
|
|
881 | //case '"': ++dec->cur; return decode_str (dec); |
|
|
882 | case '[': ++dec->cur; return decode_av (dec); |
|
|
883 | case '{': ++dec->cur; return decode_hv (dec); |
|
|
884 | |
|
|
885 | case '-': |
|
|
886 | case '0': case '1': case '2': case '3': case '4': |
|
|
887 | case '5': case '6': case '7': case '8': case '9': |
|
|
888 | //TODO return decode_num (dec); |
|
|
889 | |
|
|
890 | case 't': |
|
|
891 | if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4)) |
|
|
892 | { |
|
|
893 | dec->cur += 4; |
|
|
894 | #if CBOR_SLOW |
|
|
895 | cbor_true = get_bool ("CBOR::XS::true"); |
|
|
896 | #endif |
|
|
897 | return newSVsv (cbor_true); |
|
|
898 | } |
|
|
899 | else |
|
|
900 | ERR ("'true' expected"); |
|
|
901 | |
|
|
902 | break; |
|
|
903 | |
|
|
904 | case 'f': |
|
|
905 | if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5)) |
|
|
906 | { |
|
|
907 | dec->cur += 5; |
|
|
908 | #if CBOR_SLOW |
|
|
909 | cbor_false = get_bool ("CBOR::XS::false"); |
|
|
910 | #endif |
|
|
911 | return newSVsv (cbor_false); |
|
|
912 | } |
|
|
913 | else |
|
|
914 | ERR ("'false' expected"); |
|
|
915 | |
|
|
916 | break; |
|
|
917 | |
|
|
918 | case 'n': |
|
|
919 | if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4)) |
|
|
920 | { |
|
|
921 | dec->cur += 4; |
|
|
922 | return newSVsv (&PL_sv_undef); |
|
|
923 | } |
|
|
924 | else |
|
|
925 | ERR ("'null' expected"); |
|
|
926 | |
|
|
927 | break; |
|
|
928 | |
|
|
929 | default: |
|
|
930 | ERR ("malformed CBOR string, neither array, object, number, string or atom"); |
|
|
931 | break; |
|
|
932 | } |
|
|
933 | #endif |
|
|
934 | |
839 | |
935 | fail: |
840 | fail: |
936 | return &PL_sv_undef; |
841 | return &PL_sv_undef; |
937 | } |
842 | } |
938 | |
843 | |
… | |
… | |
981 | dec.cur = (U8 *)SvPVX (string); |
886 | dec.cur = (U8 *)SvPVX (string); |
982 | dec.end = (U8 *)SvEND (string); |
887 | dec.end = (U8 *)SvEND (string); |
983 | dec.err = 0; |
888 | dec.err = 0; |
984 | dec.depth = 0; |
889 | dec.depth = 0; |
985 | |
890 | |
986 | if (dec.cbor.cb_object || dec.cbor.cb_sk_object) |
|
|
987 | ;//TODO dec.cbor.flags |= F_HOOK; |
|
|
988 | |
|
|
989 | sv = decode_sv (&dec); |
891 | sv = decode_sv (&dec); |
990 | |
892 | |
991 | if (offset_return) |
893 | if (offset_return) |
992 | *offset_return = dec.cur; |
894 | *offset_return = dec.cur; |
993 | |
895 | |
… | |
… | |
1012 | MODULE = CBOR::XS PACKAGE = CBOR::XS |
914 | MODULE = CBOR::XS PACKAGE = CBOR::XS |
1013 | |
915 | |
1014 | BOOT: |
916 | BOOT: |
1015 | { |
917 | { |
1016 | cbor_stash = gv_stashpv ("CBOR::XS" , 1); |
918 | cbor_stash = gv_stashpv ("CBOR::XS" , 1); |
1017 | cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1); |
919 | cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1); |
1018 | |
920 | |
1019 | cbor_true = get_bool ("CBOR::XS::true"); |
921 | types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1); |
1020 | cbor_false = get_bool ("CBOR::XS::false"); |
922 | types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1); |
|
|
923 | |
|
|
924 | types_true = get_bool ("Types::Serialiser::true" ); |
|
|
925 | types_false = get_bool ("Types::Serialiser::false"); |
|
|
926 | types_error = get_bool ("Types::Serialiser::error"); |
|
|
927 | |
|
|
928 | sv_cbor = newSVpv ("CBOR", 0); |
|
|
929 | SvREADONLY_on (sv_cbor); |
1021 | } |
930 | } |
1022 | |
931 | |
1023 | PROTOTYPES: DISABLE |
932 | PROTOTYPES: DISABLE |
1024 | |
933 | |
1025 | void CLONE (...) |
934 | void CLONE (...) |
1026 | CODE: |
935 | CODE: |
1027 | cbor_stash = 0; |
936 | cbor_stash = 0; |
|
|
937 | cbor_tagged_stash = 0; |
|
|
938 | types_error_stash = 0; |
1028 | cbor_boolean_stash = 0; |
939 | types_boolean_stash = 0; |
1029 | |
940 | |
1030 | void new (char *klass) |
941 | void new (char *klass) |
1031 | PPCODE: |
942 | PPCODE: |
1032 | { |
943 | { |
1033 | SV *pv = NEWSV (0, sizeof (CBOR)); |
944 | SV *pv = NEWSV (0, sizeof (CBOR)); |
… | |
… | |
1136 | EXTEND (SP, 2); |
1047 | EXTEND (SP, 2); |
1137 | PUSHs (sv); |
1048 | PUSHs (sv); |
1138 | PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); |
1049 | PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); |
1139 | } |
1050 | } |
1140 | |
1051 | |
|
|
1052 | #if 0 |
|
|
1053 | |
1141 | void DESTROY (CBOR *self) |
1054 | void DESTROY (CBOR *self) |
1142 | CODE: |
1055 | CODE: |
1143 | SvREFCNT_dec (self->cb_sk_object); |
1056 | SvREFCNT_dec (self->cb_sk_object); |
1144 | SvREFCNT_dec (self->cb_object); |
1057 | SvREFCNT_dec (self->cb_object); |
1145 | |
1058 | |
|
|
1059 | #endif |
|
|
1060 | |
1146 | PROTOTYPES: ENABLE |
1061 | PROTOTYPES: ENABLE |
1147 | |
1062 | |
1148 | void encode_cbor (SV *scalar) |
1063 | void encode_cbor (SV *scalar) |
1149 | PPCODE: |
1064 | PPCODE: |
1150 | { |
1065 | { |