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.8 by root, Sun Oct 27 10:12:01 2013 UTC vs.
Revision 1.19 by root, Wed Nov 20 02:03:09 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// known tags, rfc7049 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
15enum cbor_tag 26enum cbor_tag
16{ 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_SHAREABLE = 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
17 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8 38 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
18 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any 39 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
19 CBOR_TAG_POS_BIGNUM = 2, // byte string 40 CBOR_TAG_POS_BIGNUM = 2, // byte string
20 CBOR_TAG_NEG_BIGNUM = 3, // byte string 41 CBOR_TAG_NEG_BIGNUM = 3, // byte string
21 CBOR_TAG_DECIMAL = 4, // decimal fraction, array 42 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
22 CBOR_TAG_BIGFLOAT = 5, // array 43 CBOR_TAG_BIGFLOAT = 5, // array
23 44
24 CBOR_TAG_CONV_B64U = 21, // base64url, any 45 CBOR_TAG_CONV_B64U = 21, // base64url, any
25 CBOR_TAG_CONV_B64 = 22, // base64, any 46 CBOR_TAG_CONV_B64 = 22, // base64, any
26 CBOR_TAG_CONV_HEX = 23, // base16, any 47 CBOR_TAG_CONV_HEX = 23, // base16, any
27 CBOR_TAG_CBOR = 24, // embedded cbor, byte string 48 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
28 49
29 CBOR_TAG_URI = 32, // URI rfc3986, utf-8 50 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
30 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8 51 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
31 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8 52 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
32 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8 53 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
33 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 54 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
34 55
35 CBOR_TAG_MAGIC = 55799 56 CBOR_TAG_MAGIC = 55799 // self-describe cbor
36}; 57};
37 58
38#define F_SHRINK 0x00000200UL 59#define F_SHRINK 0x00000001UL
39#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
40 64
41#define INIT_SIZE 32 // initial scalar size to be allocated 65#define INIT_SIZE 32 // initial scalar size to be allocated
42 66
43#define SB do { 67#define SB do {
44#define SE } while (0) 68#define SE } while (0)
… …
55#else 79#else
56# define CBOR_SLOW 0 80# define CBOR_SLOW 0
57# define CBOR_STASH cbor_stash 81# define CBOR_STASH cbor_stash
58#endif 82#endif
59 83
60static 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::
61static SV *cbor_true, *cbor_false; 85static SV *types_true, *types_false, *types_error, *sv_cbor;
62 86
63typedef struct { 87typedef struct {
64 U32 flags; 88 U32 flags;
65 U32 max_depth; 89 U32 max_depth;
66 STRLEN max_size; 90 STRLEN max_size;
… …
101#endif 125#endif
102 } 126 }
103} 127}
104 128
105///////////////////////////////////////////////////////////////////////////// 129/////////////////////////////////////////////////////////////////////////////
106// fp hell
107
108//TODO
109
110/////////////////////////////////////////////////////////////////////////////
111// encoder 130// encoder
112 131
113// structure used for encoding CBOR 132// structure used for encoding CBOR
114typedef struct 133typedef struct
115{ 134{
116 char *cur; // SvPVX (sv) + current output position 135 char *cur; // SvPVX (sv) + current output position
117 char *end; // SvEND (sv) 136 char *end; // SvEND (sv)
118 SV *sv; // result scalar 137 SV *sv; // result scalar
119 CBOR cbor; 138 CBOR cbor;
120 U32 depth; // recursion level 139 U32 depth; // recursion level
140 HV *stringref; // string => index, or 0
141 HV *shareable; // ptr => index, or 0
142 UV shareable_idx;
121} enc_t; 143} enc_t;
122 144
123ecb_inline void 145ecb_inline void
124need (enc_t *enc, STRLEN len) 146need (enc_t *enc, STRLEN len)
125{ 147{
… …
186 need (enc, len); 208 need (enc, len);
187 memcpy (enc->cur, str, len); 209 memcpy (enc->cur, str, len);
188 enc->cur += len; 210 enc->cur += len;
189} 211}
190 212
213ecb_inline void
214encode_tag (enc_t *enc, UV tag)
215{
216 encode_uint (enc, 0xc0, tag);
217}
218
191static void encode_sv (enc_t *enc, SV *sv); 219static void encode_sv (enc_t *enc, SV *sv);
192 220
193static void 221static void
194encode_av (enc_t *enc, AV *av) 222encode_av (enc_t *enc, AV *av)
195{ 223{
… …
247 275
248// encode objects, arrays and special \0=false and \1=true values. 276// encode objects, arrays and special \0=false and \1=true values.
249static void 277static void
250encode_rv (enc_t *enc, SV *sv) 278encode_rv (enc_t *enc, SV *sv)
251{ 279{
252 svtype svt;
253
254 SvGETMAGIC (sv); 280 SvGETMAGIC (sv);
281
282 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
283 && ecb_expect_false (SvREFCNT (sv) > 1))
284 {
285 if (!enc->shareable)
286 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
287
288 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
289
290 if (SvOK (*svp))
291 {
292 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
293 encode_uint (enc, 0x00, SvUV (*svp));
294 return;
295 }
296 else
297 {
298 sv_setuv (*svp, enc->shareable_idx);
299 ++enc->shareable_idx;
300 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
301 }
302 }
303
255 svt = SvTYPE (sv); 304 svtype svt = SvTYPE (sv);
256 305
257 if (ecb_expect_false (SvOBJECT (sv))) 306 if (ecb_expect_false (SvOBJECT (sv)))
258 { 307 {
259 HV *boolean_stash = !CBOR_SLOW || cbor_boolean_stash 308 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
260 ? cbor_boolean_stash 309 ? types_boolean_stash
261 : gv_stashpv ("CBOR::XS::Boolean", 1); 310 : gv_stashpv ("Types::Serialiser::Boolean", 1);
311 HV *error_stash = !CBOR_SLOW || types_error_stash
312 ? types_error_stash
313 : gv_stashpv ("Types::Serialiser::Error", 1);
262 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 314 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
263 ? cbor_tagged_stash 315 ? cbor_tagged_stash
264 : gv_stashpv ("CBOR::XS::Tagged" , 1); 316 : gv_stashpv ("CBOR::XS::Tagged" , 1);
265 317
318 HV *stash = SvSTASH (sv);
319 GV *method;
320
266 if (SvSTASH (sv) == boolean_stash) 321 if (stash == boolean_stash)
267 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 322 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
323 else if (stash == error_stash)
324 encode_ch (enc, 0xe0 | 23);
268 else if (SvSTASH (sv) == tagged_stash) 325 else if (stash == tagged_stash)
269 { 326 {
270 if (svt != SVt_PVAV) 327 if (svt != SVt_PVAV)
271 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 328 croak ("encountered CBOR::XS::Tagged object that isn't an array");
272 329
273 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 330 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
274 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 331 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
275 } 332 }
333 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
334 {
335 dSP;
336
337 ENTER; SAVETMPS; PUSHMARK (SP);
338 // we re-bless the reference to get overload and other niceties right
339 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
340
341 PUTBACK;
342 // G_SCALAR ensures that return value is 1
343 call_sv ((SV *)GvCV (method), G_SCALAR);
344 SPAGAIN;
345
346 // catch this surprisingly common error
347 if (SvROK (TOPs) && SvRV (TOPs) == sv)
348 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
349
350 encode_sv (enc, POPs);
351
352 PUTBACK;
353
354 FREETMPS; LEAVE;
355 }
356 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
357 {
358 dSP;
359
360 ENTER; SAVETMPS; PUSHMARK (SP);
361 EXTEND (SP, 2);
362 // we re-bless the reference to get overload and other niceties right
363 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
364 PUSHs (sv_cbor);
365
366 PUTBACK;
367 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
368 SPAGAIN;
369
370 // catch this surprisingly common error
371 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
372 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
373
374 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
375 encode_uint (enc, 0x80, count + 1);
376 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
377
378 while (count)
379 encode_sv (enc, SP[1 - count--]);
380
381 PUTBACK;
382
383 FREETMPS; LEAVE;
384 }
276 else 385 else
277 {
278 // 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)));
287
288 // calling with G_SCALAR ensures that we always get a 1 return value
289 PUTBACK;
290 call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
291 SPAGAIN;
292
293 // catch this surprisingly common error
294 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)));
296
297 sv = POPs;
298 PUTBACK;
299
300 encode_sv (enc, sv);
301
302 FREETMPS; LEAVE;
303 }
304 else
305 croak ("encountered object '%s', but no TO_CBOR method available on it", 386 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
306 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 387 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
307 }
308 } 388 }
309 else if (svt == SVt_PVHV) 389 else if (svt == SVt_PVHV)
310 encode_hv (enc, (HV *)sv); 390 encode_hv (enc, (HV *)sv);
311 else if (svt == SVt_PVAV) 391 else if (svt == SVt_PVAV)
312 encode_av (enc, (AV *)sv); 392 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 393 else
331 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 394 {
332 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 395 encode_tag (enc, CBOR_TAG_INDIRECTION);
396 encode_sv (enc, sv);
397 }
333} 398}
334 399
335static void 400static void
336encode_nv (enc_t *enc, SV *sv) 401encode_nv (enc_t *enc, SV *sv)
337{ 402{
… …
402} 467}
403 468
404static SV * 469static SV *
405encode_cbor (SV *scalar, CBOR *cbor) 470encode_cbor (SV *scalar, CBOR *cbor)
406{ 471{
407 enc_t enc; 472 enc_t enc = { };
408 473
409 enc.cbor = *cbor; 474 enc.cbor = *cbor;
410 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 475 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
411 enc.cur = SvPVX (enc.sv); 476 enc.cur = SvPVX (enc.sv);
412 enc.end = SvEND (enc.sv); 477 enc.end = SvEND (enc.sv);
413 enc.depth = 0;
414 478
415 SvPOK_only (enc.sv); 479 SvPOK_only (enc.sv);
416 encode_sv (&enc, scalar); 480 encode_sv (&enc, scalar);
417 481
418 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 482 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
… …
434 U8 *end; // end of input string 498 U8 *end; // end of input string
435 const char *err; // parse error, if != 0 499 const char *err; // parse error, if != 0
436 CBOR cbor; 500 CBOR cbor;
437 U32 depth; // recursion depth 501 U32 depth; // recursion depth
438 U32 maxdepth; // recursion depth limit 502 U32 maxdepth; // recursion depth limit
503 AV *shareable;
439} dec_t; 504} dec_t;
440 505
441#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 506#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
442 507
443#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 508#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
… …
537 SvREFCNT_dec (av); 602 SvREFCNT_dec (av);
538 DEC_DEC_DEPTH; 603 DEC_DEC_DEPTH;
539 return &PL_sv_undef; 604 return &PL_sv_undef;
540} 605}
541 606
607static void
608decode_he (dec_t *dec, HV *hv)
609{
610 // for speed reasons, we specialcase single-string
611 // byte or utf-8 strings as keys.
612
613 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27)
614 {
615 I32 len = decode_uint (dec);
616 char *key = (char *)dec->cur;
617
618 dec->cur += len;
619
620 hv_store (hv, key, len, decode_sv (dec), 0);
621 }
622 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27)
623 {
624 I32 len = decode_uint (dec);
625 char *key = (char *)dec->cur;
626
627 dec->cur += len;
628
629 hv_store (hv, key, -len, decode_sv (dec), 0);
630 }
631 else
632 {
633 SV *k = decode_sv (dec);
634 SV *v = decode_sv (dec);
635
636 hv_store_ent (hv, k, v, 0);
637 SvREFCNT_dec (k);
638 }
639}
640
542static SV * 641static SV *
543decode_hv (dec_t *dec) 642decode_hv (dec_t *dec)
544{ 643{
545 HV *hv = newHV (); 644 HV *hv = newHV ();
546 645
… …
558 { 657 {
559 ++dec->cur; 658 ++dec->cur;
560 break; 659 break;
561 } 660 }
562 661
563 SV *k = decode_sv (dec); 662 decode_he (dec, hv);
564 SV *v = decode_sv (dec);
565
566 hv_store_ent (hv, k, v, 0);
567 } 663 }
568 } 664 }
569 else 665 else
570 { 666 {
571 int len = decode_uint (dec); 667 int pairs = decode_uint (dec);
572 668
573 while (len--) 669 while (pairs--)
574 { 670 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 } 671 }
581 672
582 DEC_DEC_DEPTH; 673 DEC_DEC_DEPTH;
583 return newRV_noinc ((SV *)hv); 674 return newRV_noinc ((SV *)hv);
584 675
… …
633} 724}
634 725
635static SV * 726static SV *
636decode_tagged (dec_t *dec) 727decode_tagged (dec_t *dec)
637{ 728{
729 SV *sv = 0;
638 UV tag = decode_uint (dec); 730 UV tag = decode_uint (dec);
731
732 WANT (1);
733
734 switch (tag)
735 {
736 case CBOR_TAG_MAGIC:
737 return decode_sv (dec);
738
739 case CBOR_TAG_INDIRECTION:
740 return newRV_noinc (decode_sv (dec));
741
742 case CBOR_TAG_VALUE_SHAREABLE:
743 {
744 if (ecb_expect_false (!dec->shareable))
745 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
746
747 sv = newSV (0);
748 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
749
639 SV *sv = decode_sv (dec); 750 SV *osv = decode_sv (dec);
751 sv_setsv (sv, osv);
752 SvREFCNT_dec_NN (osv);
753 }
640 754
641 if (tag == CBOR_TAG_MAGIC) // 2.4.5 Self-Describe CBOR
642 return sv; 755 return sv;
643 756
757 case CBOR_TAG_VALUE_SHAREDREF:
758 {
759 if ((*dec->cur >> 5) != 0)
760 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
761
762 UV idx = decode_uint (dec);
763
764 if (!dec->shareable || idx > AvFILLp (dec->shareable))
765 ERR ("corrupted CBOR data (sharedref index out of bounds)");
766
767 return SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
768 }
769
770 case CBOR_TAG_PERL_OBJECT:
771 {
772 sv = decode_sv (dec);
773
774 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
775 ERR ("corrupted CBOR data (non-array perl object)");
776
777 AV *av = (AV *)SvRV (sv);
778 int len = av_len (av) + 1;
779 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
780
781 if (!stash)
782 ERR ("cannot decode perl-object (package does not exist)");
783
784 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
785
786 if (!method)
787 ERR ("cannot decode perl-object (package does not have a THAW method)");
788
789 dSP;
790
791 ENTER; SAVETMPS; PUSHMARK (SP);
792 EXTEND (SP, len + 1);
793 // we re-bless the reference to get overload and other niceties right
794 PUSHs (*av_fetch (av, 0, 1));
795 PUSHs (sv_cbor);
796
797 int i;
798
799 for (i = 1; i < len; ++i)
800 PUSHs (*av_fetch (av, i, 1));
801
802 PUTBACK;
803 call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
804 SPAGAIN;
805
806 if (SvTRUE (ERRSV))
807 {
808 FREETMPS; LEAVE;
809 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
810 }
811
812 SvREFCNT_dec (sv);
813 sv = SvREFCNT_inc (POPs);
814
815 PUTBACK;
816
817 FREETMPS; LEAVE;
818
819 return sv;
820 }
821
822 default:
823 {
824 sv = decode_sv (dec);
825
644 AV *av = newAV (); 826 AV *av = newAV ();
645 av_push (av, newSVuv (tag)); 827 av_push (av, newSVuv (tag));
646 av_push (av, sv); 828 av_push (av, sv);
647 829
648 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 830 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
649 ? cbor_tagged_stash 831 ? cbor_tagged_stash
650 : gv_stashpv ("CBOR::XS::Tagged" , 1); 832 : gv_stashpv ("CBOR::XS::Tagged" , 1);
651 833
652 return sv_bless (newRV_noinc ((SV *)av), tagged_stash); 834 return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
835 }
836 }
837
838fail:
839 SvREFCNT_dec (sv);
840 return &PL_sv_undef;
653} 841}
654 842
655static SV * 843static SV *
656decode_sv (dec_t *dec) 844decode_sv (dec_t *dec)
657{ 845{
… …
676 case 7: // misc 864 case 7: // misc
677 switch (*dec->cur++ & 31) 865 switch (*dec->cur++ & 31)
678 { 866 {
679 case 20: 867 case 20:
680#if CBOR_SLOW 868#if CBOR_SLOW
681 cbor_false = get_bool ("CBOR::XS::false"); 869 types_false = get_bool ("Types::Serialiser::false");
682#endif 870#endif
683 return newSVsv (cbor_false); 871 return newSVsv (types_false);
684 case 21: 872 case 21:
685#if CBOR_SLOW 873#if CBOR_SLOW
686 cbor_true = get_bool ("CBOR::XS::true"); 874 types_true = get_bool ("Types::Serialiser::true");
687#endif 875#endif
688 return newSVsv (cbor_true); 876 return newSVsv (types_true);
689 case 22: 877 case 22:
690 return newSVsv (&PL_sv_undef); 878 return newSVsv (&PL_sv_undef);
879 case 23:
880#if CBOR_SLOW
881 types_error = get_bool ("Types::Serialiser::error");
882#endif
883 return newSVsv (types_error);
691 884
692 case 25: 885 case 25:
693 { 886 {
694 WANT (2); 887 WANT (2);
695 888
… …
739} 932}
740 933
741static SV * 934static SV *
742decode_cbor (SV *string, CBOR *cbor, char **offset_return) 935decode_cbor (SV *string, CBOR *cbor, char **offset_return)
743{ 936{
744 dec_t dec; 937 dec_t dec = { };
745 SV *sv; 938 SV *sv;
939 STRLEN len;
940 char *data = SvPVbyte (string, len);
746 941
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) 942 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", 943 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); 944 (unsigned long)len, (unsigned long)cbor->max_size);
778 }
779
780 sv_utf8_downgrade (string, 0);
781 945
782 dec.cbor = *cbor; 946 dec.cbor = *cbor;
783 dec.cur = (U8 *)SvPVX (string); 947 dec.cur = (U8 *)data;
784 dec.end = (U8 *)SvEND (string); 948 dec.end = (U8 *)data + len;
785 dec.err = 0;
786 dec.depth = 0;
787 949
788 sv = decode_sv (&dec); 950 sv = decode_sv (&dec);
789 951
790 if (offset_return) 952 if (offset_return)
791 *offset_return = dec.cur; 953 *offset_return = dec.cur;
… …
795 dec.err = "garbage after CBOR object"; 957 dec.err = "garbage after CBOR object";
796 958
797 if (dec.err) 959 if (dec.err)
798 { 960 {
799 SvREFCNT_dec (sv); 961 SvREFCNT_dec (sv);
800 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 962 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
801 } 963 }
802 964
803 sv = sv_2mortal (sv); 965 sv = sv_2mortal (sv);
804 966
805 return sv; 967 return sv;
… …
811MODULE = CBOR::XS PACKAGE = CBOR::XS 973MODULE = CBOR::XS PACKAGE = CBOR::XS
812 974
813BOOT: 975BOOT:
814{ 976{
815 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 977 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); 978 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
818 979
819 cbor_true = get_bool ("CBOR::XS::true"); 980 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
820 cbor_false = get_bool ("CBOR::XS::false"); 981 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
982
983 types_true = get_bool ("Types::Serialiser::true" );
984 types_false = get_bool ("Types::Serialiser::false");
985 types_error = get_bool ("Types::Serialiser::error");
986
987 sv_cbor = newSVpv ("CBOR", 0);
988 SvREADONLY_on (sv_cbor);
821} 989}
822 990
823PROTOTYPES: DISABLE 991PROTOTYPES: DISABLE
824 992
825void CLONE (...) 993void CLONE (...)
826 CODE: 994 CODE:
827 cbor_stash = 0; 995 cbor_stash = 0;
828 cbor_boolean_stash = 0;
829 cbor_tagged_stash = 0; 996 cbor_tagged_stash = 0;
997 types_error_stash = 0;
998 types_boolean_stash = 0;
830 999
831void new (char *klass) 1000void new (char *klass)
832 PPCODE: 1001 PPCODE:
833{ 1002{
834 SV *pv = NEWSV (0, sizeof (CBOR)); 1003 SV *pv = NEWSV (0, sizeof (CBOR));
… …
842 1011
843void shrink (CBOR *self, int enable = 1) 1012void shrink (CBOR *self, int enable = 1)
844 ALIAS: 1013 ALIAS:
845 shrink = F_SHRINK 1014 shrink = F_SHRINK
846 allow_unknown = F_ALLOW_UNKNOWN 1015 allow_unknown = F_ALLOW_UNKNOWN
1016 allow_sharing = F_ALLOW_SHARING
1017 dedup_keys = F_DEDUP_KEYS
1018 dedup_strings = F_DEDUP_STRINGS
847 PPCODE: 1019 PPCODE:
848{ 1020{
849 if (enable) 1021 if (enable)
850 self->flags |= ix; 1022 self->flags |= ix;
851 else 1023 else
… …
856 1028
857void get_shrink (CBOR *self) 1029void get_shrink (CBOR *self)
858 ALIAS: 1030 ALIAS:
859 get_shrink = F_SHRINK 1031 get_shrink = F_SHRINK
860 get_allow_unknown = F_ALLOW_UNKNOWN 1032 get_allow_unknown = F_ALLOW_UNKNOWN
1033 get_allow_sharing = F_ALLOW_SHARING
1034 get_dedup_keys = F_DEDUP_KEYS
1035 get_dedup_strings = F_DEDUP_STRINGS
861 PPCODE: 1036 PPCODE:
862 XPUSHs (boolSV (self->flags & ix)); 1037 XPUSHs (boolSV (self->flags & ix));
863 1038
864void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1039void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
865 PPCODE: 1040 PPCODE:
… …
880int get_max_size (CBOR *self) 1055int get_max_size (CBOR *self)
881 CODE: 1056 CODE:
882 RETVAL = self->max_size; 1057 RETVAL = self->max_size;
883 OUTPUT: 1058 OUTPUT:
884 RETVAL 1059 RETVAL
885
886#if 0 //TODO
887
888void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
889 PPCODE:
890{
891 SvREFCNT_dec (self->cb_object);
892 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0;
893
894 XPUSHs (ST (0));
895}
896
897void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef)
898 PPCODE:
899{
900 if (!self->cb_sk_object)
901 self->cb_sk_object = newHV ();
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 1060
921void encode (CBOR *self, SV *scalar) 1061void encode (CBOR *self, SV *scalar)
922 PPCODE: 1062 PPCODE:
923 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1063 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
924 XPUSHs (scalar); 1064 XPUSHs (scalar);
… …
937 EXTEND (SP, 2); 1077 EXTEND (SP, 2);
938 PUSHs (sv); 1078 PUSHs (sv);
939 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1079 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
940} 1080}
941 1081
942#if 0
943
944void DESTROY (CBOR *self)
945 CODE:
946 SvREFCNT_dec (self->cb_sk_object);
947 SvREFCNT_dec (self->cb_object);
948
949#endif
950
951PROTOTYPES: ENABLE 1082PROTOTYPES: ENABLE
952 1083
953void encode_cbor (SV *scalar) 1084void encode_cbor (SV *scalar)
954 PPCODE: 1085 PPCODE:
955{ 1086{

Diff Legend

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