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

Comparing CBOR-XS/XS.xs (file contents):
Revision 1.7 by root, Sat Oct 26 23:02:55 2013 UTC vs.
Revision 1.18 by root, Wed Nov 20 01:09:46 2013 UTC

… …
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11 11
12#include "ecb.h" 12#include "ecb.h"
13 13
14// compatibility with perl <5.18
15#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
17#endif
18#ifndef HvNAMELEN
19# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20#endif
21#ifndef HvNAMEUTF8
22# define HvNAMEUTF8(hv) 0
23#endif
24
25// known tags
26enum cbor_tag
27{
28 // inofficial extensions (pending iana registration)
29 CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object
30 CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object
31 CBOR_TAG_VALUE_SHARABLE = 26, // http://cbor.schmorp.de/value-sharing
32 CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing
33 CBOR_TAG_STRINGREF_NAMESPACE = 65537, // http://cbor.schmorp.de/stringref
34 CBOR_TAG_STRINGREF = 28, // http://cbor.schmorp.de/stringref
35 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
36
37 // rfc7049
38 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
39 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
40 CBOR_TAG_POS_BIGNUM = 2, // byte string
41 CBOR_TAG_NEG_BIGNUM = 3, // byte string
42 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
43 CBOR_TAG_BIGFLOAT = 5, // array
44
45 CBOR_TAG_CONV_B64U = 21, // base64url, any
46 CBOR_TAG_CONV_B64 = 22, // base64, any
47 CBOR_TAG_CONV_HEX = 23, // base16, any
48 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
49
50 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
51 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
52 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
53 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
54 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
55
56 CBOR_TAG_MAGIC = 55799 // self-describe cbor
57};
58
14#define F_SHRINK 0x00000200UL 59#define F_SHRINK 0x00000001UL
15#define F_ALLOW_UNKNOWN 0x00002000UL 60#define F_ALLOW_UNKNOWN 0x00000002UL
61#define F_ALLOW_SHARING 0x00000004UL //TODO
62#define F_DEDUP_STRINGS 0x00000008UL //TODO
63#define F_DEDUP_KEYS 0x00000010UL //TODO
16 64
17#define INIT_SIZE 32 // initial scalar size to be allocated 65#define INIT_SIZE 32 // initial scalar size to be allocated
18 66
19#define SB do { 67#define SB do {
20#define SE } while (0) 68#define SE } while (0)
… …
31#else 79#else
32# define CBOR_SLOW 0 80# define CBOR_SLOW 0
33# define CBOR_STASH cbor_stash 81# define CBOR_STASH cbor_stash
34#endif 82#endif
35 83
36static HV *cbor_stash, *cbor_boolean_stash, *cbor_tagged_stash; // CBOR::XS:: 84static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
37static SV *cbor_true, *cbor_false; 85static SV *types_true, *types_false, *types_error, *sv_cbor;
38 86
39typedef struct { 87typedef struct {
40 U32 flags; 88 U32 flags;
41 U32 max_depth; 89 U32 max_depth;
42 STRLEN max_size; 90 STRLEN max_size;
… …
77#endif 125#endif
78 } 126 }
79} 127}
80 128
81///////////////////////////////////////////////////////////////////////////// 129/////////////////////////////////////////////////////////////////////////////
82// fp hell
83
84//TODO
85
86/////////////////////////////////////////////////////////////////////////////
87// encoder 130// encoder
88 131
89// structure used for encoding CBOR 132// structure used for encoding CBOR
90typedef struct 133typedef struct
91{ 134{
92 char *cur; // SvPVX (sv) + current output position 135 char *cur; // SvPVX (sv) + current output position
93 char *end; // SvEND (sv) 136 char *end; // SvEND (sv)
94 SV *sv; // result scalar 137 SV *sv; // result scalar
95 CBOR cbor; 138 CBOR cbor;
96 U32 depth; // recursion level 139 U32 depth; // recursion level
140 HV *stringref; // string => index, or 0
141 HV *sharable; // ptr => index, or 0
142 HV *sharable_idx;
97} enc_t; 143} enc_t;
98 144
99ecb_inline void 145ecb_inline void
100need (enc_t *enc, STRLEN len) 146need (enc_t *enc, STRLEN len)
101{ 147{
… …
162 need (enc, len); 208 need (enc, len);
163 memcpy (enc->cur, str, len); 209 memcpy (enc->cur, str, len);
164 enc->cur += len; 210 enc->cur += len;
165} 211}
166 212
213ecb_inline void
214encode_tag (enc_t *enc, UV tag)
215{
216 encode_uint (enc, 0xc0, tag);
217}
218
219static int
220encode_sharable2 (enc_t *enc, SV *sv)
221{
222 if (!enc->sharable)
223 enc->sharable = (HV *)sv_2mortal ((SV *)newHV ());
224
225 SV **svp = hv_fetch (enc->sharable, &sv, sizeof (sv), 1);
226
227 if (SvOK (*svp))
228 {
229 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
230 encode_uint (enc, 0x00, SvUV (*svp));
231
232 return 1;
233 }
234 else
235 {
236 sv_setuv (*svp, enc->sharable_idx++);
237 encode_tag (enc, CBOR_TAG_VALUE_SHARABLE);
238
239 return 0;
240 }
241}
242
243ecb_inline int
244encode_sharable (enc_t *enc, SV *sv)
245{
246 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
247 && ecb_expect_false (SvREFCNT (sv) > 1))
248 return encode_sharable2 (enc, sv);
249
250 return 0;
251}
252
167static void encode_sv (enc_t *enc, SV *sv); 253static void encode_sv (enc_t *enc, SV *sv);
168 254
169static void 255static void
170encode_av (enc_t *enc, AV *av) 256encode_av (enc_t *enc, AV *av)
171{ 257{
… …
228 svtype svt; 314 svtype svt;
229 315
230 SvGETMAGIC (sv); 316 SvGETMAGIC (sv);
231 svt = SvTYPE (sv); 317 svt = SvTYPE (sv);
232 318
319 if (encode_sharable (enc, sv))
320 return;
321
233 if (ecb_expect_false (SvOBJECT (sv))) 322 if (ecb_expect_false (SvOBJECT (sv)))
234 { 323 {
235 HV *boolean_stash = !CBOR_SLOW || cbor_boolean_stash 324 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
236 ? cbor_boolean_stash 325 ? types_boolean_stash
237 : gv_stashpv ("CBOR::XS::Boolean", 1); 326 : gv_stashpv ("Types::Serialiser::Boolean", 1);
327 HV *error_stash = !CBOR_SLOW || types_error_stash
328 ? types_error_stash
329 : gv_stashpv ("Types::Serialiser::Error", 1);
238 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 330 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
239 ? cbor_tagged_stash 331 ? cbor_tagged_stash
240 : gv_stashpv ("CBOR::XS::Tagged" , 1); 332 : gv_stashpv ("CBOR::XS::Tagged" , 1);
241 333
334 HV *stash = SvSTASH (sv);
335 GV *method;
336
242 if (SvSTASH (sv) == boolean_stash) 337 if (stash == boolean_stash)
243 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 338 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
339 else if (stash == error_stash)
340 encode_ch (enc, 0xe0 | 23);
244 else if (SvSTASH (sv) == tagged_stash) 341 else if (stash == tagged_stash)
245 { 342 {
246 if (svt != SVt_PVAV) 343 if (svt != SVt_PVAV)
247 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 344 croak ("encountered CBOR::XS::Tagged object that isn't an array");
248 345
249 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 346 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
250 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 347 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
251 } 348 }
349 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
350 {
351 dSP;
352
353 ENTER; SAVETMPS; PUSHMARK (SP);
354 // we re-bless the reference to get overload and other niceties right
355 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
356
357 PUTBACK;
358 // G_SCALAR ensures that return value is 1
359 call_sv ((SV *)GvCV (method), G_SCALAR);
360 SPAGAIN;
361
362 // catch this surprisingly common error
363 if (SvROK (TOPs) && SvRV (TOPs) == sv)
364 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
365
366 encode_sv (enc, POPs);
367
368 PUTBACK;
369
370 FREETMPS; LEAVE;
371 }
372 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
373 {
374 dSP;
375
376 ENTER; SAVETMPS; PUSHMARK (SP);
377 EXTEND (SP, 2);
378 // we re-bless the reference to get overload and other niceties right
379 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
380 PUSHs (sv_cbor);
381
382 PUTBACK;
383 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
384 SPAGAIN;
385
386 // catch this surprisingly common error
387 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
388 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
389
390 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
391 encode_uint (enc, 0x80, count + 1);
392 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
393
394 while (count)
395 encode_sv (enc, SP[1 - count--]);
396
397 PUTBACK;
398
399 FREETMPS; LEAVE;
400 }
252 else 401 else
253 {
254 // we re-bless the reference to get overload and other niceties right
255 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
256
257 if (to_cbor)
258 {
259 dSP;
260
261 ENTER; SAVETMPS; PUSHMARK (SP);
262 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
263
264 // calling with G_SCALAR ensures that we always get a 1 return value
265 PUTBACK;
266 call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
267 SPAGAIN;
268
269 // catch this surprisingly common error
270 if (SvROK (TOPs) && SvRV (TOPs) == sv)
271 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
272
273 sv = POPs;
274 PUTBACK;
275
276 encode_sv (enc, sv);
277
278 FREETMPS; LEAVE;
279 }
280 else
281 croak ("encountered object '%s', but no TO_CBOR method available on it", 402 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
282 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 403 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
283 }
284 } 404 }
285 else if (svt == SVt_PVHV) 405 else if (svt == SVt_PVHV)
286 encode_hv (enc, (HV *)sv); 406 encode_hv (enc, (HV *)sv);
287 else if (svt == SVt_PVAV) 407 else if (svt == SVt_PVAV)
288 encode_av (enc, (AV *)sv); 408 encode_av (enc, (AV *)sv);
289 else if (svt < SVt_PVAV)
290 {
291 STRLEN len = 0;
292 char *pv = svt ? SvPV (sv, len) : 0;
293
294 if (len == 1 && *pv == '1')
295 encode_ch (enc, 0xe0 | 21);
296 else if (len == 1 && *pv == '0')
297 encode_ch (enc, 0xe0 | 20);
298 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
299 encode_ch (enc, 0xe0 | 23);
300 else
301 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
302 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
303 }
304 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
305 encode_ch (enc, 0xe0 | 23);
306 else 409 else
307 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 410 {
308 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 411 encode_tag (enc, CBOR_TAG_INDIRECTION);
412 encode_sv (enc, sv);
413 }
309} 414}
310 415
311static void 416static void
312encode_nv (enc_t *enc, SV *sv) 417encode_nv (enc_t *enc, SV *sv)
313{ 418{
… …
346 451
347static void 452static void
348encode_sv (enc_t *enc, SV *sv) 453encode_sv (enc_t *enc, SV *sv)
349{ 454{
350 SvGETMAGIC (sv); 455 SvGETMAGIC (sv);
456
457 if (encode_sharable (enc, sv))
458 return;
351 459
352 if (SvPOKp (sv)) 460 if (SvPOKp (sv))
353 { 461 {
354 STRLEN len; 462 STRLEN len;
355 char *str = SvPV (sv, len); 463 char *str = SvPV (sv, len);
… …
378} 486}
379 487
380static SV * 488static SV *
381encode_cbor (SV *scalar, CBOR *cbor) 489encode_cbor (SV *scalar, CBOR *cbor)
382{ 490{
383 enc_t enc; 491 enc_t enc = { };
384 492
385 enc.cbor = *cbor; 493 enc.cbor = *cbor;
386 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 494 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
387 enc.cur = SvPVX (enc.sv); 495 enc.cur = SvPVX (enc.sv);
388 enc.end = SvEND (enc.sv); 496 enc.end = SvEND (enc.sv);
389 enc.depth = 0;
390 497
391 SvPOK_only (enc.sv); 498 SvPOK_only (enc.sv);
392 encode_sv (&enc, scalar); 499 encode_sv (&enc, scalar);
393 500
394 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 501 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
… …
410 U8 *end; // end of input string 517 U8 *end; // end of input string
411 const char *err; // parse error, if != 0 518 const char *err; // parse error, if != 0
412 CBOR cbor; 519 CBOR cbor;
413 U32 depth; // recursion depth 520 U32 depth; // recursion depth
414 U32 maxdepth; // recursion depth limit 521 U32 maxdepth; // recursion depth limit
522 AV *sharable;
415} dec_t; 523} dec_t;
416 524
417#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 525#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
418 526
419#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 527#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
… …
513 SvREFCNT_dec (av); 621 SvREFCNT_dec (av);
514 DEC_DEC_DEPTH; 622 DEC_DEC_DEPTH;
515 return &PL_sv_undef; 623 return &PL_sv_undef;
516} 624}
517 625
626static void
627decode_he (dec_t *dec, HV *hv)
628{
629 // for speed reasons, we specialcase single-string
630 // byte or utf-8 strings as keys.
631
632 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27)
633 {
634 I32 len = decode_uint (dec);
635 char *key = (char *)dec->cur;
636
637 dec->cur += len;
638
639 hv_store (hv, key, len, decode_sv (dec), 0);
640 }
641 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27)
642 {
643 I32 len = decode_uint (dec);
644 char *key = (char *)dec->cur;
645
646 dec->cur += len;
647
648 hv_store (hv, key, -len, decode_sv (dec), 0);
649 }
650 else
651 {
652 SV *k = decode_sv (dec);
653 SV *v = decode_sv (dec);
654
655 hv_store_ent (hv, k, v, 0);
656 SvREFCNT_dec (k);
657 }
658}
659
518static SV * 660static SV *
519decode_hv (dec_t *dec) 661decode_hv (dec_t *dec)
520{ 662{
521 HV *hv = newHV (); 663 HV *hv = newHV ();
522 664
… …
534 { 676 {
535 ++dec->cur; 677 ++dec->cur;
536 break; 678 break;
537 } 679 }
538 680
539 SV *k = decode_sv (dec); 681 decode_he (dec, hv);
540 SV *v = decode_sv (dec);
541
542 hv_store_ent (hv, k, v, 0);
543 } 682 }
544 } 683 }
545 else 684 else
546 { 685 {
547 int len = decode_uint (dec); 686 int pairs = decode_uint (dec);
548 687
549 while (len--) 688 while (pairs--)
550 { 689 decode_he (dec, hv);
551 SV *k = decode_sv (dec);
552 SV *v = decode_sv (dec);
553
554 hv_store_ent (hv, k, v, 0);
555 }
556 } 690 }
557 691
558 DEC_DEC_DEPTH; 692 DEC_DEC_DEPTH;
559 return newRV_noinc ((SV *)hv); 693 return newRV_noinc ((SV *)hv);
560 694
… …
612decode_tagged (dec_t *dec) 746decode_tagged (dec_t *dec)
613{ 747{
614 UV tag = decode_uint (dec); 748 UV tag = decode_uint (dec);
615 SV *sv = decode_sv (dec); 749 SV *sv = decode_sv (dec);
616 750
617 if (tag == 55799) // 2.4.5 Self-Describe CBOR 751 switch (tag)
752 {
753 case CBOR_TAG_MAGIC:
618 return sv; 754 return sv;
619 755
756 case CBOR_TAG_INDIRECTION:
757 return newRV_noinc (sv);
758
759 case CBOR_TAG_VALUE_SHARABLE:
760 if (ecb_expect_false (!dec->sharable))
761 dec->sharable = (AV *)sv_2mortal ((SV *)newAV ());
762
763 av_push (dec->sharable, SvREFCNT_inc_NN (sv));
764
765 return sv;
766
767 case CBOR_TAG_VALUE_SHAREDREF:
768 {
769 // TODO: should verify that the sv atcually was a CBOR unsigned integer
770 UV idx = SvUV (sv);
771
772 if (!dec->sharable || idx > AvFILLp (dec->sharable))
773 ERR ("corrupted CBOR data (sharedref index out of bounds)");
774
775 SvREFCNT_dec (sv);
776
777 return SvREFCNT_inc_NN (AvARRAY (dec->sharable)[idx]);
778 }
779
780 case CBOR_TAG_PERL_OBJECT:
781 {
782 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
783 ERR ("corrupted CBOR data (non-array perl object)");
784
785 AV *av = (AV *)SvRV (sv);
786 int len = av_len (av) + 1;
787 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
788
789 if (!stash)
790 ERR ("cannot decode perl-object (package does not exist)");
791
792 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
793
794 if (!method)
795 ERR ("cannot decode perl-object (package does not have a THAW method)");
796
797 dSP;
798
799 ENTER; SAVETMPS; PUSHMARK (SP);
800 EXTEND (SP, len + 1);
801 // we re-bless the reference to get overload and other niceties right
802 PUSHs (*av_fetch (av, 0, 1));
803 PUSHs (sv_cbor);
804
805 int i;
806
807 for (i = 1; i < len; ++i)
808 PUSHs (*av_fetch (av, i, 1));
809
810 PUTBACK;
811 call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
812 SPAGAIN;
813
814 if (SvTRUE (ERRSV))
815 {
816 FREETMPS; LEAVE;
817 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
818 }
819
820 SvREFCNT_dec (sv);
821 sv = SvREFCNT_inc (POPs);
822
823 PUTBACK;
824
825 FREETMPS; LEAVE;
826
827 return sv;
828 }
829
830 default:
831 {
620 AV *av = newAV (); 832 AV *av = newAV ();
621 av_push (av, newSVuv (tag)); 833 av_push (av, newSVuv (tag));
622 av_push (av, sv); 834 av_push (av, sv);
623 835
624 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 836 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
625 ? cbor_tagged_stash 837 ? cbor_tagged_stash
626 : gv_stashpv ("CBOR::XS::Tagged" , 1); 838 : gv_stashpv ("CBOR::XS::Tagged" , 1);
627 839
628 return sv_bless (newRV_noinc ((SV *)av), tagged_stash); 840 return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
841 }
842 }
843
844fail:
845 SvREFCNT_dec (sv);
846 return &PL_sv_undef;
629} 847}
630 848
631static SV * 849static SV *
632decode_sv (dec_t *dec) 850decode_sv (dec_t *dec)
633{ 851{
… …
652 case 7: // misc 870 case 7: // misc
653 switch (*dec->cur++ & 31) 871 switch (*dec->cur++ & 31)
654 { 872 {
655 case 20: 873 case 20:
656#if CBOR_SLOW 874#if CBOR_SLOW
657 cbor_false = get_bool ("CBOR::XS::false"); 875 types_false = get_bool ("Types::Serialiser::false");
658#endif 876#endif
659 return newSVsv (cbor_false); 877 return newSVsv (types_false);
660 case 21: 878 case 21:
661#if CBOR_SLOW 879#if CBOR_SLOW
662 cbor_true = get_bool ("CBOR::XS::true"); 880 types_true = get_bool ("Types::Serialiser::true");
663#endif 881#endif
664 return newSVsv (cbor_true); 882 return newSVsv (types_true);
665 case 22: 883 case 22:
666 return newSVsv (&PL_sv_undef); 884 return newSVsv (&PL_sv_undef);
885 case 23:
886#if CBOR_SLOW
887 types_error = get_bool ("Types::Serialiser::error");
888#endif
889 return newSVsv (types_error);
667 890
668 case 25: 891 case 25:
669 { 892 {
670 WANT (2); 893 WANT (2);
671 894
… …
715} 938}
716 939
717static SV * 940static SV *
718decode_cbor (SV *string, CBOR *cbor, char **offset_return) 941decode_cbor (SV *string, CBOR *cbor, char **offset_return)
719{ 942{
720 dec_t dec; 943 dec_t dec = { };
721 SV *sv; 944 SV *sv;
945 STRLEN len;
946 char *data = SvPVbyte (string, len);
722 947
723 /* work around bugs in 5.10 where manipulating magic values
724 * makes perl ignore the magic in subsequent accesses.
725 * also make a copy of non-PV values, to get them into a clean
726 * state (SvPV should do that, but it's buggy, see below).
727 */
728 /*SvGETMAGIC (string);*/
729 if (SvMAGICAL (string) || !SvPOK (string))
730 string = sv_2mortal (newSVsv (string));
731
732 SvUPGRADE (string, SVt_PV);
733
734 /* work around a bug in perl 5.10, which causes SvCUR to fail an
735 * assertion with -DDEBUGGING, although SvCUR is documented to
736 * return the xpv_cur field which certainly exists after upgrading.
737 * according to nicholas clark, calling SvPOK fixes this.
738 * But it doesn't fix it, so try another workaround, call SvPV_nolen
739 * and hope for the best.
740 * Damnit, SvPV_nolen still trips over yet another assertion. This
741 * assertion business is seriously broken, try yet another workaround
742 * for the broken -DDEBUGGING.
743 */
744 {
745#ifdef DEBUGGING
746 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
747#else
748 STRLEN offset = SvCUR (string);
749#endif
750
751 if (offset > cbor->max_size && cbor->max_size) 948 if (len > cbor->max_size && cbor->max_size)
752 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu", 949 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
753 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 950 (unsigned long)len, (unsigned long)cbor->max_size);
754 }
755
756 sv_utf8_downgrade (string, 0);
757 951
758 dec.cbor = *cbor; 952 dec.cbor = *cbor;
759 dec.cur = (U8 *)SvPVX (string); 953 dec.cur = (U8 *)data;
760 dec.end = (U8 *)SvEND (string); 954 dec.end = (U8 *)data + len;
761 dec.err = 0;
762 dec.depth = 0;
763 955
764 sv = decode_sv (&dec); 956 sv = decode_sv (&dec);
765 957
766 if (offset_return) 958 if (offset_return)
767 *offset_return = dec.cur; 959 *offset_return = dec.cur;
… …
771 dec.err = "garbage after CBOR object"; 963 dec.err = "garbage after CBOR object";
772 964
773 if (dec.err) 965 if (dec.err)
774 { 966 {
775 SvREFCNT_dec (sv); 967 SvREFCNT_dec (sv);
776 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 968 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
777 } 969 }
778 970
779 sv = sv_2mortal (sv); 971 sv = sv_2mortal (sv);
780 972
781 return sv; 973 return sv;
… …
787MODULE = CBOR::XS PACKAGE = CBOR::XS 979MODULE = CBOR::XS PACKAGE = CBOR::XS
788 980
789BOOT: 981BOOT:
790{ 982{
791 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 983 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
792 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
793 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1); 984 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
794 985
795 cbor_true = get_bool ("CBOR::XS::true"); 986 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
796 cbor_false = get_bool ("CBOR::XS::false"); 987 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
988
989 types_true = get_bool ("Types::Serialiser::true" );
990 types_false = get_bool ("Types::Serialiser::false");
991 types_error = get_bool ("Types::Serialiser::error");
992
993 sv_cbor = newSVpv ("CBOR", 0);
994 SvREADONLY_on (sv_cbor);
797} 995}
798 996
799PROTOTYPES: DISABLE 997PROTOTYPES: DISABLE
800 998
801void CLONE (...) 999void CLONE (...)
802 CODE: 1000 CODE:
803 cbor_stash = 0; 1001 cbor_stash = 0;
804 cbor_boolean_stash = 0;
805 cbor_tagged_stash = 0; 1002 cbor_tagged_stash = 0;
1003 types_error_stash = 0;
1004 types_boolean_stash = 0;
806 1005
807void new (char *klass) 1006void new (char *klass)
808 PPCODE: 1007 PPCODE:
809{ 1008{
810 SV *pv = NEWSV (0, sizeof (CBOR)); 1009 SV *pv = NEWSV (0, sizeof (CBOR));
… …
818 1017
819void shrink (CBOR *self, int enable = 1) 1018void shrink (CBOR *self, int enable = 1)
820 ALIAS: 1019 ALIAS:
821 shrink = F_SHRINK 1020 shrink = F_SHRINK
822 allow_unknown = F_ALLOW_UNKNOWN 1021 allow_unknown = F_ALLOW_UNKNOWN
1022 allow_sharing = F_ALLOW_SHARING
1023 dedup_keys = F_DEDUP_KEYS
1024 dedup_strings = F_DEDUP_STRINGS
823 PPCODE: 1025 PPCODE:
824{ 1026{
825 if (enable) 1027 if (enable)
826 self->flags |= ix; 1028 self->flags |= ix;
827 else 1029 else
… …
832 1034
833void get_shrink (CBOR *self) 1035void get_shrink (CBOR *self)
834 ALIAS: 1036 ALIAS:
835 get_shrink = F_SHRINK 1037 get_shrink = F_SHRINK
836 get_allow_unknown = F_ALLOW_UNKNOWN 1038 get_allow_unknown = F_ALLOW_UNKNOWN
1039 get_allow_sharing = F_ALLOW_SHARING
1040 get_dedup_keys = F_DEDUP_KEYS
1041 get_dedup_strings = F_DEDUP_STRINGS
837 PPCODE: 1042 PPCODE:
838 XPUSHs (boolSV (self->flags & ix)); 1043 XPUSHs (boolSV (self->flags & ix));
839 1044
840void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1045void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
841 PPCODE: 1046 PPCODE:
… …
856int get_max_size (CBOR *self) 1061int get_max_size (CBOR *self)
857 CODE: 1062 CODE:
858 RETVAL = self->max_size; 1063 RETVAL = self->max_size;
859 OUTPUT: 1064 OUTPUT:
860 RETVAL 1065 RETVAL
861
862#if 0 //TODO
863
864void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
865 PPCODE:
866{
867 SvREFCNT_dec (self->cb_object);
868 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
869
870 XPUSHs (ST (0));
871}
872
873void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef)
874 PPCODE:
875{
876 if (!self->cb_sk_object)
877 self->cb_sk_object = newHV ();
878
879 if (SvOK (cb))
880 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
881 else
882 {
883 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
884
885 if (!HvKEYS (self->cb_sk_object))
886 {
887 SvREFCNT_dec (self->cb_sk_object);
888 self->cb_sk_object = 0;
889 }
890 }
891
892 XPUSHs (ST (0));
893}
894
895#endif
896 1066
897void encode (CBOR *self, SV *scalar) 1067void encode (CBOR *self, SV *scalar)
898 PPCODE: 1068 PPCODE:
899 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1069 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
900 XPUSHs (scalar); 1070 XPUSHs (scalar);
… …
913 EXTEND (SP, 2); 1083 EXTEND (SP, 2);
914 PUSHs (sv); 1084 PUSHs (sv);
915 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1085 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
916} 1086}
917 1087
918#if 0
919
920void DESTROY (CBOR *self)
921 CODE:
922 SvREFCNT_dec (self->cb_sk_object);
923 SvREFCNT_dec (self->cb_object);
924
925#endif
926
927PROTOTYPES: ENABLE 1088PROTOTYPES: ENABLE
928 1089
929void encode_cbor (SV *scalar) 1090void encode_cbor (SV *scalar)
930 PPCODE: 1091 PPCODE:
931{ 1092{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines