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.5 by root, Sat Oct 26 21:14:20 2013 UTC vs.
Revision 1.31 by root, Thu Nov 28 11:43:26 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#ifndef SvREFCNT_dec_NN
25# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
26#endif
27
28// known tags
29enum cbor_tag
30{
31 // extensions
32 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
33 CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
34 CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
35 CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
36 CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
37 CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
38 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
39
40 // rfc7049
41 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
42 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
43 CBOR_TAG_POS_BIGNUM = 2, // byte string
44 CBOR_TAG_NEG_BIGNUM = 3, // byte string
45 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
46 CBOR_TAG_BIGFLOAT = 5, // array
47
48 CBOR_TAG_CONV_B64U = 21, // base64url, any
49 CBOR_TAG_CONV_B64 = 22, // base64, any
50 CBOR_TAG_CONV_HEX = 23, // base16, any
51 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
52
53 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
54 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
55 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
56 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
57 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
58
59 CBOR_TAG_MAGIC = 55799 // self-describe cbor
60};
61
14#define F_SHRINK 0x00000200UL 62#define F_SHRINK 0x00000001UL
15#define F_ALLOW_UNKNOWN 0x00002000UL 63#define F_ALLOW_UNKNOWN 0x00000002UL
64#define F_ALLOW_SHARING 0x00000004UL //TODO
65#define F_ALLOW_STRINGREF 0x00000008UL //TODO
16 66
17#define INIT_SIZE 32 // initial scalar size to be allocated 67#define INIT_SIZE 32 // initial scalar size to be allocated
18 68
19#define SB do { 69#define SB do {
20#define SE } while (0) 70#define SE } while (0)
… …
31#else 81#else
32# define CBOR_SLOW 0 82# define CBOR_SLOW 0
33# define CBOR_STASH cbor_stash 83# define CBOR_STASH cbor_stash
34#endif 84#endif
35 85
36static HV *cbor_stash, *cbor_boolean_stash; // CBOR::XS:: 86static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
37static SV *cbor_true, *cbor_false; 87static SV *types_true, *types_false, *types_error, *sv_cbor, *default_filter;
38 88
39typedef struct { 89typedef struct {
40 U32 flags; 90 U32 flags;
41 U32 max_depth; 91 U32 max_depth;
42 STRLEN max_size; 92 STRLEN max_size;
43 93 SV *filter;
44 SV *cb_object;
45 HV *cb_sk_object;
46} CBOR; 94} CBOR;
47 95
48ecb_inline void 96ecb_inline void
49cbor_init (CBOR *cbor) 97cbor_init (CBOR *cbor)
50{ 98{
51 Zero (cbor, 1, CBOR); 99 Zero (cbor, 1, CBOR);
52 cbor->max_depth = 512; 100 cbor->max_depth = 512;
101}
102
103ecb_inline void
104cbor_free (CBOR *cbor)
105{
106 SvREFCNT_dec (cbor->filter);
53} 107}
54 108
55///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
56// utility functions 110// utility functions
57 111
… …
79 SvPV_renew (sv, SvCUR (sv) + 1); 133 SvPV_renew (sv, SvCUR (sv) + 1);
80#endif 134#endif
81 } 135 }
82} 136}
83 137
84///////////////////////////////////////////////////////////////////////////// 138// minimum length of a string to be registered for stringref
85// fp hell 139ecb_inline int
86 140minimum_string_length (UV idx)
87//TODO 141{
142 return idx > 23
143 ? idx > 0xffU
144 ? idx > 0xffffU
145 ? idx > 0xffffffffU
146 ? 11
147 : 7
148 : 5
149 : 4
150 : 3;
151}
88 152
89///////////////////////////////////////////////////////////////////////////// 153/////////////////////////////////////////////////////////////////////////////
90// encoder 154// encoder
91 155
92// structure used for encoding CBOR 156// structure used for encoding CBOR
… …
95 char *cur; // SvPVX (sv) + current output position 159 char *cur; // SvPVX (sv) + current output position
96 char *end; // SvEND (sv) 160 char *end; // SvEND (sv)
97 SV *sv; // result scalar 161 SV *sv; // result scalar
98 CBOR cbor; 162 CBOR cbor;
99 U32 depth; // recursion level 163 U32 depth; // recursion level
164 HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
165 UV stringref_idx;
166 HV *shareable; // ptr => index, or 0
167 UV shareable_idx;
100} enc_t; 168} enc_t;
101 169
102ecb_inline void 170ecb_inline void
103need (enc_t *enc, STRLEN len) 171need (enc_t *enc, STRLEN len)
104{ 172{
… …
121static void 189static void
122encode_uint (enc_t *enc, int major, UV len) 190encode_uint (enc_t *enc, int major, UV len)
123{ 191{
124 need (enc, 9); 192 need (enc, 9);
125 193
126 if (len < 24) 194 if (ecb_expect_true (len < 24))
127 *enc->cur++ = major | len; 195 *enc->cur++ = major | len;
128 else if (len <= 0xff) 196 else if (ecb_expect_true (len <= 0xff))
129 { 197 {
130 *enc->cur++ = major | 24; 198 *enc->cur++ = major | 24;
131 *enc->cur++ = len; 199 *enc->cur++ = len;
132 } 200 }
133 else if (len <= 0xffff) 201 else if (len <= 0xffff)
… …
156 *enc->cur++ = len >> 8; 224 *enc->cur++ = len >> 8;
157 *enc->cur++ = len; 225 *enc->cur++ = len;
158 } 226 }
159} 227}
160 228
161static void 229ecb_inline void
230encode_tag (enc_t *enc, UV tag)
231{
232 encode_uint (enc, 0xc0, tag);
233}
234
235ecb_inline void
162encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 236encode_str (enc_t *enc, int utf8, char *str, STRLEN len)
163{ 237{
164 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 238 encode_uint (enc, utf8 ? 0x60 : 0x40, len);
165 need (enc, len); 239 need (enc, len);
166 memcpy (enc->cur, str, len); 240 memcpy (enc->cur, str, len);
167 enc->cur += len; 241 enc->cur += len;
168} 242}
169 243
244static void
245encode_strref (enc_t *enc, int utf8, char *str, STRLEN len)
246{
247 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF))
248 {
249 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
250
251 if (SvOK (*svp))
252 {
253 // already registered, use stringref
254 encode_tag (enc, CBOR_TAG_STRINGREF);
255 encode_uint (enc, 0x00, SvUV (*svp));
256 return;
257 }
258 else if (len >= minimum_string_length (enc->stringref_idx))
259 {
260 // register only
261 sv_setuv (*svp, enc->stringref_idx);
262 ++enc->stringref_idx;
263 }
264 }
265
266 encode_str (enc, utf8, str, len);
267}
268
170static void encode_sv (enc_t *enc, SV *sv); 269static void encode_sv (enc_t *enc, SV *sv);
171 270
172static void 271static void
173encode_av (enc_t *enc, AV *av) 272encode_av (enc_t *enc, AV *av)
174{ 273{
… …
211 while ((he = hv_iternext (hv))) 310 while ((he = hv_iternext (hv)))
212 { 311 {
213 if (HeKLEN (he) == HEf_SVKEY) 312 if (HeKLEN (he) == HEf_SVKEY)
214 encode_sv (enc, HeSVKEY (he)); 313 encode_sv (enc, HeSVKEY (he));
215 else 314 else
216 encode_str (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 315 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
217 316
218 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 317 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
219 } 318 }
220 319
221 if (mg) 320 if (mg)
… …
226 325
227// encode objects, arrays and special \0=false and \1=true values. 326// encode objects, arrays and special \0=false and \1=true values.
228static void 327static void
229encode_rv (enc_t *enc, SV *sv) 328encode_rv (enc_t *enc, SV *sv)
230{ 329{
231 svtype svt;
232
233 SvGETMAGIC (sv); 330 SvGETMAGIC (sv);
331
332 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
333 && ecb_expect_false (SvREFCNT (sv) > 1))
334 {
335 if (!enc->shareable)
336 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
337
338 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
339
340 if (SvOK (*svp))
341 {
342 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
343 encode_uint (enc, 0x00, SvUV (*svp));
344 return;
345 }
346 else
347 {
348 sv_setuv (*svp, enc->shareable_idx);
349 ++enc->shareable_idx;
350 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
351 }
352 }
353
234 svt = SvTYPE (sv); 354 svtype svt = SvTYPE (sv);
235 355
236 if (ecb_expect_false (SvOBJECT (sv))) 356 if (ecb_expect_false (SvOBJECT (sv)))
237 { 357 {
238 HV *stash = !CBOR_SLOW || cbor_boolean_stash 358 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
239 ? cbor_boolean_stash 359 ? types_boolean_stash
360 : gv_stashpv ("Types::Serialiser::Boolean", 1);
361 HV *error_stash = !CBOR_SLOW || types_error_stash
362 ? types_error_stash
363 : gv_stashpv ("Types::Serialiser::Error", 1);
364 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
365 ? cbor_tagged_stash
240 : gv_stashpv ("CBOR::XS::Boolean", 1); 366 : gv_stashpv ("CBOR::XS::Tagged" , 1);
241 367
242 if (SvSTASH (sv) == stash) 368 HV *stash = SvSTASH (sv);
369 GV *method;
370
371 if (stash == boolean_stash)
243 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 372 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20);
373 else if (stash == error_stash)
374 encode_ch (enc, 0xe0 | 23);
375 else if (stash == tagged_stash)
376 {
377 if (svt != SVt_PVAV)
378 croak ("encountered CBOR::XS::Tagged object that isn't an array");
379
380 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1)));
381 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
382 }
383 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
384 {
385 dSP;
386
387 ENTER; SAVETMPS; PUSHMARK (SP);
388 // we re-bless the reference to get overload and other niceties right
389 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
390
391 PUTBACK;
392 // G_SCALAR ensures that return value is 1
393 call_sv ((SV *)GvCV (method), G_SCALAR);
394 SPAGAIN;
395
396 // catch this surprisingly common error
397 if (SvROK (TOPs) && SvRV (TOPs) == sv)
398 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
399
400 encode_sv (enc, POPs);
401
402 PUTBACK;
403
404 FREETMPS; LEAVE;
405 }
406 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
407 {
408 dSP;
409
410 ENTER; SAVETMPS; PUSHMARK (SP);
411 EXTEND (SP, 2);
412 // we re-bless the reference to get overload and other niceties right
413 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
414 PUSHs (sv_cbor);
415
416 PUTBACK;
417 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
418 SPAGAIN;
419
420 // catch this surprisingly common error
421 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
422 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
423
424 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
425 encode_uint (enc, 0x80, count + 1);
426 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
427
428 while (count)
429 encode_sv (enc, SP[1 - count--]);
430
431 PUTBACK;
432
433 FREETMPS; LEAVE;
434 }
244 else 435 else
245 {
246#if 0 //TODO
247 if (enc->cbor.flags & F_CONV_BLESSED)
248 {
249 // we re-bless the reference to get overload and other niceties right
250 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
251
252 if (to_cbor)
253 {
254 dSP;
255
256 ENTER; SAVETMPS; PUSHMARK (SP);
257 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv)));
258
259 // calling with G_SCALAR ensures that we always get a 1 return value
260 PUTBACK;
261 call_sv ((SV *)GvCV (to_cbor), G_SCALAR);
262 SPAGAIN;
263
264 // catch this surprisingly common error
265 if (SvROK (TOPs) && SvRV (TOPs) == sv)
266 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv)));
267
268 sv = POPs;
269 PUTBACK;
270
271 encode_sv (enc, sv);
272
273 FREETMPS; LEAVE;
274 }
275 else if (enc->cbor.flags & F_ALLOW_BLESSED)
276 encode_str (enc, "null", 4, 0);
277 else
278 croak ("encountered object '%s', but neither allow_blessed enabled nor TO_CBOR method available on it", 436 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
279 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
280 }
281 else if (enc->cbor.flags & F_ALLOW_BLESSED)
282 encode_str (enc, "null", 4, 0);
283 else
284 croak ("encountered object '%s', but neither allow_blessed nor convert_blessed settings are enabled",
285 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 437 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
286#endif
287 }
288 } 438 }
289 else if (svt == SVt_PVHV) 439 else if (svt == SVt_PVHV)
290 encode_hv (enc, (HV *)sv); 440 encode_hv (enc, (HV *)sv);
291 else if (svt == SVt_PVAV) 441 else if (svt == SVt_PVAV)
292 encode_av (enc, (AV *)sv); 442 encode_av (enc, (AV *)sv);
293 else if (svt < SVt_PVAV)
294 {
295 STRLEN len = 0;
296 char *pv = svt ? SvPV (sv, len) : 0;
297
298 if (len == 1 && *pv == '1')
299 encode_ch (enc, 0xe0 | 21);
300 else if (len == 1 && *pv == '0')
301 encode_ch (enc, 0xe0 | 20);
302 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
303 encode_ch (enc, 0xe0 | 23);
304 else
305 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
306 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
307 }
308 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
309 encode_ch (enc, 0xe0 | 23);
310 else 443 else
311 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 444 {
312 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 445 encode_tag (enc, CBOR_TAG_INDIRECTION);
446 encode_sv (enc, sv);
447 }
313} 448}
314 449
315static void 450static void
316encode_nv (enc_t *enc, SV *sv) 451encode_nv (enc_t *enc, SV *sv)
317{ 452{
… …
355 490
356 if (SvPOKp (sv)) 491 if (SvPOKp (sv))
357 { 492 {
358 STRLEN len; 493 STRLEN len;
359 char *str = SvPV (sv, len); 494 char *str = SvPV (sv, len);
360 encode_str (enc, SvUTF8 (sv), str, len); 495 encode_strref (enc, SvUTF8 (sv), str, len);
361 } 496 }
362 else if (SvNOKp (sv)) 497 else if (SvNOKp (sv))
363 encode_nv (enc, sv); 498 encode_nv (enc, sv);
364 else if (SvIOKp (sv)) 499 else if (SvIOKp (sv))
365 { 500 {
… …
382} 517}
383 518
384static SV * 519static SV *
385encode_cbor (SV *scalar, CBOR *cbor) 520encode_cbor (SV *scalar, CBOR *cbor)
386{ 521{
387 enc_t enc; 522 enc_t enc = { };
388 523
389 enc.cbor = *cbor; 524 enc.cbor = *cbor;
390 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 525 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
391 enc.cur = SvPVX (enc.sv); 526 enc.cur = SvPVX (enc.sv);
392 enc.end = SvEND (enc.sv); 527 enc.end = SvEND (enc.sv);
393 enc.depth = 0;
394 528
395 SvPOK_only (enc.sv); 529 SvPOK_only (enc.sv);
530
531 if (cbor->flags & F_ALLOW_STRINGREF)
532 {
533 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
534 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
535 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
536 }
537
396 encode_sv (&enc, scalar); 538 encode_sv (&enc, scalar);
397 539
398 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 540 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
399 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 541 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
400 542
… …
414 U8 *end; // end of input string 556 U8 *end; // end of input string
415 const char *err; // parse error, if != 0 557 const char *err; // parse error, if != 0
416 CBOR cbor; 558 CBOR cbor;
417 U32 depth; // recursion depth 559 U32 depth; // recursion depth
418 U32 maxdepth; // recursion depth limit 560 U32 maxdepth; // recursion depth limit
561 AV *shareable;
562 AV *stringref;
563 SV *decode_tagged;
419} dec_t; 564} dec_t;
420 565
421#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 566#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
422 567
423#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 568#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
… …
517 SvREFCNT_dec (av); 662 SvREFCNT_dec (av);
518 DEC_DEC_DEPTH; 663 DEC_DEC_DEPTH;
519 return &PL_sv_undef; 664 return &PL_sv_undef;
520} 665}
521 666
667static void
668decode_he (dec_t *dec, HV *hv)
669{
670 // for speed reasons, we specialcase single-string
671 // byte or utf-8 strings as keys, but only when !stringref
672
673 if (ecb_expect_true (!dec->stringref))
674 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27)
675 {
676 I32 len = decode_uint (dec);
677 char *key = (char *)dec->cur;
678
679 dec->cur += len;
680
681 if (ecb_expect_false (dec->stringref))
682 av_push (dec->stringref, newSVpvn (key, len));
683
684 hv_store (hv, key, len, decode_sv (dec), 0);
685
686 return;
687 }
688 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27)
689 {
690 I32 len = decode_uint (dec);
691 char *key = (char *)dec->cur;
692
693 dec->cur += len;
694
695 if (ecb_expect_false (dec->stringref))
696 av_push (dec->stringref, newSVpvn_utf8 (key, len, 1));
697
698 hv_store (hv, key, -len, decode_sv (dec), 0);
699
700 return;
701 }
702
703 SV *k = decode_sv (dec);
704 SV *v = decode_sv (dec);
705
706 hv_store_ent (hv, k, v, 0);
707 SvREFCNT_dec (k);
708}
709
522static SV * 710static SV *
523decode_hv (dec_t *dec) 711decode_hv (dec_t *dec)
524{ 712{
525 HV *hv = newHV (); 713 HV *hv = newHV ();
526 714
… …
538 { 726 {
539 ++dec->cur; 727 ++dec->cur;
540 break; 728 break;
541 } 729 }
542 730
543 SV *k = decode_sv (dec); 731 decode_he (dec, hv);
544 SV *v = decode_sv (dec);
545
546 hv_store_ent (hv, k, v, 0);
547 } 732 }
548 } 733 }
549 else 734 else
550 { 735 {
551 int len = decode_uint (dec); 736 int pairs = decode_uint (dec);
552 737
553 while (len--) 738 while (pairs--)
554 { 739 decode_he (dec, hv);
555 SV *k = decode_sv (dec);
556 SV *v = decode_sv (dec);
557
558 hv_store_ent (hv, k, v, 0);
559 }
560 } 740 }
561 741
562 DEC_DEC_DEPTH; 742 DEC_DEC_DEPTH;
563 return newRV_noinc ((SV *)hv); 743 return newRV_noinc ((SV *)hv);
564
565#if 0
566 SV *sv;
567 HV *hv = newHV ();
568
569 DEC_INC_DEPTH;
570 decode_ws (dec);
571
572 for (;;)
573 {
574 // heuristic: assume that
575 // a) decode_str + hv_store_ent are abysmally slow.
576 // b) most hash keys are short, simple ascii text.
577 // => try to "fast-match" such strings to avoid
578 // the overhead of decode_str + hv_store_ent.
579 {
580 SV *value;
581 char *p = dec->cur;
582 char *e = p + 24; // only try up to 24 bytes
583
584 for (;;)
585 {
586 // the >= 0x80 is false on most architectures
587 if (p == e || *p < 0x20 || *p >= 0x80 || *p == '\\')
588 {
589 // slow path, back up and use decode_str
590 SV *key = decode_str (dec);
591 if (!key)
592 goto fail;
593
594 decode_ws (dec); EXPECT_CH (':');
595
596 decode_ws (dec);
597 value = decode_sv (dec);
598 if (!value)
599 {
600 SvREFCNT_dec (key);
601 goto fail;
602 }
603
604 hv_store_ent (hv, key, value, 0);
605 SvREFCNT_dec (key);
606
607 break;
608 }
609 else if (*p == '"')
610 {
611 // fast path, got a simple key
612 char *key = dec->cur;
613 int len = p - key;
614 dec->cur = p + 1;
615
616 decode_ws (dec); EXPECT_CH (':');
617
618 decode_ws (dec);
619 value = decode_sv (dec);
620 if (!value)
621 goto fail;
622
623 hv_store (hv, key, len, value, 0);
624
625 break;
626 }
627
628 ++p;
629 }
630 }
631
632 decode_ws (dec);
633
634 if (*dec->cur == '}')
635 {
636 ++dec->cur;
637 break;
638 }
639
640 if (*dec->cur != ',')
641 ERR (", or } expected while parsing object/hash");
642
643 ++dec->cur;
644
645 decode_ws (dec);
646
647 if (*dec->cur == '}' && dec->cbor.flags & F_RELAXED)
648 {
649 ++dec->cur;
650 break;
651 }
652 }
653
654 DEC_DEC_DEPTH;
655 sv = newRV_noinc ((SV *)hv);
656
657 // check filter callbacks
658 if (dec->cbor.flags & F_HOOK)
659 {
660 if (dec->cbor.cb_sk_object && HvKEYS (hv) == 1)
661 {
662 HE *cb, *he;
663
664 hv_iterinit (hv);
665 he = hv_iternext (hv);
666 hv_iterinit (hv);
667
668 // the next line creates a mortal sv each time its called.
669 // might want to optimise this for common cases.
670 cb = hv_fetch_ent (dec->cbor.cb_sk_object, hv_iterkeysv (he), 0, 0);
671
672 if (cb)
673 {
674 dSP;
675 int count;
676
677 ENTER; SAVETMPS; PUSHMARK (SP);
678 XPUSHs (HeVAL (he));
679 sv_2mortal (sv);
680
681 PUTBACK; count = call_sv (HeVAL (cb), G_ARRAY); SPAGAIN;
682
683 if (count == 1)
684 {
685 sv = newSVsv (POPs);
686 FREETMPS; LEAVE;
687 return sv;
688 }
689
690 SvREFCNT_inc (sv);
691 FREETMPS; LEAVE;
692 }
693 }
694
695 if (dec->cbor.cb_object)
696 {
697 dSP;
698 int count;
699
700 ENTER; SAVETMPS; PUSHMARK (SP);
701 XPUSHs (sv_2mortal (sv));
702
703 PUTBACK; count = call_sv (dec->cbor.cb_object, G_ARRAY); SPAGAIN;
704
705 if (count == 1)
706 {
707 sv = newSVsv (POPs);
708 FREETMPS; LEAVE;
709 return sv;
710 }
711
712 SvREFCNT_inc (sv);
713 FREETMPS; LEAVE;
714 }
715 }
716
717 return sv;
718#endif
719 744
720fail: 745fail:
721 SvREFCNT_dec (hv); 746 SvREFCNT_dec (hv);
722 DEC_DEC_DEPTH; 747 DEC_DEC_DEPTH;
723 return &PL_sv_undef; 748 return &PL_sv_undef;
724} 749}
725 750
726static SV * 751static SV *
727decode_str (dec_t *dec, int utf8) 752decode_str (dec_t *dec, int utf8)
728{ 753{
729 SV *sv; 754 SV *sv = 0;
730 755
731 if ((*dec->cur & 31) == 31) 756 if ((*dec->cur & 31) == 31)
732 { 757 {
733 ++dec->cur; 758 ++dec->cur;
734 759
… …
743 { 768 {
744 ++dec->cur; 769 ++dec->cur;
745 break; 770 break;
746 } 771 }
747 772
748 SV *sv2 = decode_sv (dec);
749 sv_catsv (sv, sv2); 773 sv_catsv (sv, decode_sv (dec));
750 } 774 }
751 } 775 }
752 else 776 else
753 { 777 {
754 STRLEN len = decode_uint (dec); 778 STRLEN len = decode_uint (dec);
755 779
756 WANT (len); 780 WANT (len);
757 sv = newSVpvn (dec->cur, len); 781 sv = newSVpvn (dec->cur, len);
758 dec->cur += len; 782 dec->cur += len;
783
784 if (ecb_expect_false (dec->stringref)
785 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
786 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
759 } 787 }
760 788
761 if (utf8) 789 if (utf8)
762 SvUTF8_on (sv); 790 SvUTF8_on (sv);
763 791
764 return sv; 792 return sv;
765 793
766fail: 794fail:
795 SvREFCNT_dec (sv);
767 return &PL_sv_undef; 796 return &PL_sv_undef;
768} 797}
769 798
770static SV * 799static SV *
771decode_tagged (dec_t *dec) 800decode_tagged (dec_t *dec)
772{ 801{
802 SV *sv = 0;
773 UV tag = decode_uint (dec); 803 UV tag = decode_uint (dec);
804
805 WANT (1);
806
807 switch (tag)
808 {
809 case CBOR_TAG_MAGIC:
810 sv = decode_sv (dec);
811 break;
812
813 case CBOR_TAG_INDIRECTION:
814 sv = newRV_noinc (decode_sv (dec));
815 break;
816
817 case CBOR_TAG_STRINGREF_NAMESPACE:
818 {
819 ENTER; SAVETMPS;
820
821 SAVESPTR (dec->stringref);
822 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
823
824 sv = decode_sv (dec);
825
826 FREETMPS; LEAVE;
827 }
828 break;
829
830 case CBOR_TAG_STRINGREF:
831 {
832 if ((*dec->cur >> 5) != 0)
833 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
834
835 UV idx = decode_uint (dec);
836
837 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))
838 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
839
840 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
841 }
842 break;
843
844 case CBOR_TAG_VALUE_SHAREABLE:
845 {
846 if (ecb_expect_false (!dec->shareable))
847 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
848
849 sv = newSV (0);
850 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
851
774 SV *sv = decode_sv (dec); 852 SV *osv = decode_sv (dec);
853 sv_setsv (sv, osv);
854 SvREFCNT_dec_NN (osv);
855 }
856 break;
775 857
776 if (tag == 55799) // 2.4.5 Self-Describe CBOR 858 case CBOR_TAG_VALUE_SHAREDREF:
859 {
860 if ((*dec->cur >> 5) != 0)
861 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
862
863 UV idx = decode_uint (dec);
864
865 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))
866 ERR ("corrupted CBOR data (sharedref index out of bounds)");
867
868 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
869 }
870 break;
871
872 case CBOR_TAG_PERL_OBJECT:
873 {
874 sv = decode_sv (dec);
875
876 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
877 ERR ("corrupted CBOR data (non-array perl object)");
878
879 AV *av = (AV *)SvRV (sv);
880 int len = av_len (av) + 1;
881 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
882
883 if (!stash)
884 ERR ("cannot decode perl-object (package does not exist)");
885
886 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
887
888 if (!method)
889 ERR ("cannot decode perl-object (package does not have a THAW method)");
890
891 dSP;
892
893 ENTER; SAVETMPS; PUSHMARK (SP);
894 EXTEND (SP, len + 1);
895 // we re-bless the reference to get overload and other niceties right
896 PUSHs (*av_fetch (av, 0, 1));
897 PUSHs (sv_cbor);
898
899 int i;
900
901 for (i = 1; i < len; ++i)
902 PUSHs (*av_fetch (av, i, 1));
903
904 PUTBACK;
905 call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
906 SPAGAIN;
907
908 if (SvTRUE (ERRSV))
909 {
910 FREETMPS; LEAVE;
911 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
912 }
913
914 SvREFCNT_dec (sv);
915 sv = SvREFCNT_inc (POPs);
916
917 PUTBACK;
918
919 FREETMPS; LEAVE;
920 }
921 break;
922
923 default:
924 {
925 sv = decode_sv (dec);
926
927 dSP;
928 ENTER; SAVETMPS; PUSHMARK (SP);
929 EXTEND (SP, 2);
930 PUSHs (newSVuv (tag));
931 PUSHs (sv);
932
933 PUTBACK;
934 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
935 SPAGAIN;
936
937 if (SvTRUE (ERRSV))
938 {
939 FREETMPS; LEAVE;
940 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV))));
941 }
942
943 if (count)
944 {
945 SvREFCNT_dec (sv);
946 sv = SvREFCNT_inc (POPs);
947 }
948 else
949 {
950 AV *av = newAV ();
951 av_push (av, newSVuv (tag));
952 av_push (av, sv);
953
954 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
955 ? cbor_tagged_stash
956 : gv_stashpv ("CBOR::XS::Tagged" , 1);
957 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
958 }
959
960 PUTBACK;
961
962 FREETMPS; LEAVE;
963 }
964 break;
965 }
966
777 return sv; 967 return sv;
778 968
779 AV *av = newAV (); 969fail:
780 av_push (av, newSVuv (tag)); 970 SvREFCNT_dec (sv);
781 av_push (av, sv); 971 return &PL_sv_undef;
782 return newRV_noinc ((SV *)av);
783} 972}
784 973
785static SV * 974static SV *
786decode_sv (dec_t *dec) 975decode_sv (dec_t *dec)
787{ 976{
788 WANT (1); 977 WANT (1);
789 978
790 switch (*dec->cur >> 5) 979 switch (*dec->cur >> 5)
791 { 980 {
792 case 0: // unsigned int 981 case 0: // unsigned int
793 //TODO: 64 bit values on 3 2bit perls
794 return newSVuv (decode_uint (dec)); 982 return newSVuv (decode_uint (dec));
795 case 1: // negative int 983 case 1: // negative int
796 return newSViv (-1 - (IV)decode_uint (dec)); 984 return newSViv (-1 - (IV)decode_uint (dec));
797 case 2: // octet string 985 case 2: // octet string
798 return decode_str (dec, 0); 986 return decode_str (dec, 0);
… …
807 case 7: // misc 995 case 7: // misc
808 switch (*dec->cur++ & 31) 996 switch (*dec->cur++ & 31)
809 { 997 {
810 case 20: 998 case 20:
811#if CBOR_SLOW 999#if CBOR_SLOW
812 cbor_false = get_bool ("CBOR::XS::false"); 1000 types_false = get_bool ("Types::Serialiser::false");
813#endif 1001#endif
814 return newSVsv (cbor_false); 1002 return newSVsv (types_false);
815 case 21: 1003 case 21:
816#if CBOR_SLOW 1004#if CBOR_SLOW
817 cbor_true = get_bool ("CBOR::XS::true"); 1005 types_true = get_bool ("Types::Serialiser::true");
818#endif 1006#endif
819 return newSVsv (cbor_true); 1007 return newSVsv (types_true);
820 case 22: 1008 case 22:
821 return newSVsv (&PL_sv_undef); 1009 return newSVsv (&PL_sv_undef);
1010 case 23:
1011#if CBOR_SLOW
1012 types_error = get_bool ("Types::Serialiser::error");
1013#endif
1014 return newSVsv (types_error);
822 1015
823 case 25: 1016 case 25:
824 { 1017 {
825 WANT (2); 1018 WANT (2);
826 1019
… …
862 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1055 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)");
863 } 1056 }
864 1057
865 break; 1058 break;
866 } 1059 }
867#if 0
868 switch (*dec->cur)
869 {
870 //case '"': ++dec->cur; return decode_str (dec);
871 case '[': ++dec->cur; return decode_av (dec);
872 case '{': ++dec->cur; return decode_hv (dec);
873
874 case '-':
875 case '0': case '1': case '2': case '3': case '4':
876 case '5': case '6': case '7': case '8': case '9':
877 //TODO return decode_num (dec);
878
879 case 't':
880 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "true", 4))
881 {
882 dec->cur += 4;
883#if CBOR_SLOW
884 cbor_true = get_bool ("CBOR::XS::true");
885#endif
886 return newSVsv (cbor_true);
887 }
888 else
889 ERR ("'true' expected");
890
891 break;
892
893 case 'f':
894 if (dec->end - dec->cur >= 5 && !memcmp (dec->cur, "false", 5))
895 {
896 dec->cur += 5;
897#if CBOR_SLOW
898 cbor_false = get_bool ("CBOR::XS::false");
899#endif
900 return newSVsv (cbor_false);
901 }
902 else
903 ERR ("'false' expected");
904
905 break;
906
907 case 'n':
908 if (dec->end - dec->cur >= 4 && !memcmp (dec->cur, "null", 4))
909 {
910 dec->cur += 4;
911 return newSVsv (&PL_sv_undef);
912 }
913 else
914 ERR ("'null' expected");
915
916 break;
917
918 default:
919 ERR ("malformed CBOR string, neither array, object, number, string or atom");
920 break;
921 }
922#endif
923 1060
924fail: 1061fail:
925 return &PL_sv_undef; 1062 return &PL_sv_undef;
926} 1063}
927 1064
928static SV * 1065static SV *
929decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1066decode_cbor (SV *string, CBOR *cbor, char **offset_return)
930{ 1067{
931 dec_t dec; 1068 dec_t dec = { };
932 SV *sv; 1069 SV *sv;
1070 STRLEN len;
1071 char *data = SvPVbyte (string, len);
933 1072
934 /* work around bugs in 5.10 where manipulating magic values
935 * makes perl ignore the magic in subsequent accesses.
936 * also make a copy of non-PV values, to get them into a clean
937 * state (SvPV should do that, but it's buggy, see below).
938 */
939 /*SvGETMAGIC (string);*/
940 if (SvMAGICAL (string) || !SvPOK (string))
941 string = sv_2mortal (newSVsv (string));
942
943 SvUPGRADE (string, SVt_PV);
944
945 /* work around a bug in perl 5.10, which causes SvCUR to fail an
946 * assertion with -DDEBUGGING, although SvCUR is documented to
947 * return the xpv_cur field which certainly exists after upgrading.
948 * according to nicholas clark, calling SvPOK fixes this.
949 * But it doesn't fix it, so try another workaround, call SvPV_nolen
950 * and hope for the best.
951 * Damnit, SvPV_nolen still trips over yet another assertion. This
952 * assertion business is seriously broken, try yet another workaround
953 * for the broken -DDEBUGGING.
954 */
955 {
956#ifdef DEBUGGING
957 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
958#else
959 STRLEN offset = SvCUR (string);
960#endif
961
962 if (offset > cbor->max_size && cbor->max_size) 1073 if (len > cbor->max_size && cbor->max_size)
963 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu", 1074 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
964 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 1075 (unsigned long)len, (unsigned long)cbor->max_size);
965 }
966
967 sv_utf8_downgrade (string, 0);
968 1076
969 dec.cbor = *cbor; 1077 dec.cbor = *cbor;
970 dec.cur = (U8 *)SvPVX (string); 1078 dec.cur = (U8 *)data;
971 dec.end = (U8 *)SvEND (string); 1079 dec.end = (U8 *)data + len;
972 dec.err = 0;
973 dec.depth = 0;
974
975 if (dec.cbor.cb_object || dec.cbor.cb_sk_object)
976 ;//TODO dec.cbor.flags |= F_HOOK;
977 1080
978 sv = decode_sv (&dec); 1081 sv = decode_sv (&dec);
979 1082
980 if (offset_return) 1083 if (offset_return)
981 *offset_return = dec.cur; 1084 *offset_return = dec.cur;
… …
985 dec.err = "garbage after CBOR object"; 1088 dec.err = "garbage after CBOR object";
986 1089
987 if (dec.err) 1090 if (dec.err)
988 { 1091 {
989 SvREFCNT_dec (sv); 1092 SvREFCNT_dec (sv);
990 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 1093 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
991 } 1094 }
992 1095
993 sv = sv_2mortal (sv); 1096 sv = sv_2mortal (sv);
994 1097
995 return sv; 1098 return sv;
… …
1001MODULE = CBOR::XS PACKAGE = CBOR::XS 1104MODULE = CBOR::XS PACKAGE = CBOR::XS
1002 1105
1003BOOT: 1106BOOT:
1004{ 1107{
1005 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 1108 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
1006 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1); 1109 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
1007 1110
1008 cbor_true = get_bool ("CBOR::XS::true"); 1111 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
1009 cbor_false = get_bool ("CBOR::XS::false"); 1112 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
1113
1114 types_true = get_bool ("Types::Serialiser::true" );
1115 types_false = get_bool ("Types::Serialiser::false");
1116 types_error = get_bool ("Types::Serialiser::error");
1117
1118 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1119
1120 sv_cbor = newSVpv ("CBOR", 0);
1121 SvREADONLY_on (sv_cbor);
1010} 1122}
1011 1123
1012PROTOTYPES: DISABLE 1124PROTOTYPES: DISABLE
1013 1125
1014void CLONE (...) 1126void CLONE (...)
1015 CODE: 1127 CODE:
1016 cbor_stash = 0; 1128 cbor_stash = 0;
1129 cbor_tagged_stash = 0;
1130 types_error_stash = 0;
1017 cbor_boolean_stash = 0; 1131 types_boolean_stash = 0;
1018 1132
1019void new (char *klass) 1133void new (char *klass)
1020 PPCODE: 1134 PPCODE:
1021{ 1135{
1022 SV *pv = NEWSV (0, sizeof (CBOR)); 1136 SV *pv = NEWSV (0, sizeof (CBOR));
… …
1030 1144
1031void shrink (CBOR *self, int enable = 1) 1145void shrink (CBOR *self, int enable = 1)
1032 ALIAS: 1146 ALIAS:
1033 shrink = F_SHRINK 1147 shrink = F_SHRINK
1034 allow_unknown = F_ALLOW_UNKNOWN 1148 allow_unknown = F_ALLOW_UNKNOWN
1149 allow_sharing = F_ALLOW_SHARING
1150 allow_stringref = F_ALLOW_STRINGREF
1035 PPCODE: 1151 PPCODE:
1036{ 1152{
1037 if (enable) 1153 if (enable)
1038 self->flags |= ix; 1154 self->flags |= ix;
1039 else 1155 else
… …
1044 1160
1045void get_shrink (CBOR *self) 1161void get_shrink (CBOR *self)
1046 ALIAS: 1162 ALIAS:
1047 get_shrink = F_SHRINK 1163 get_shrink = F_SHRINK
1048 get_allow_unknown = F_ALLOW_UNKNOWN 1164 get_allow_unknown = F_ALLOW_UNKNOWN
1165 get_allow_sharing = F_ALLOW_SHARING
1166 get_allow_stringref = F_ALLOW_STRINGREF
1049 PPCODE: 1167 PPCODE:
1050 XPUSHs (boolSV (self->flags & ix)); 1168 XPUSHs (boolSV (self->flags & ix));
1051 1169
1052void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1170void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1053 PPCODE: 1171 PPCODE:
… …
1069 CODE: 1187 CODE:
1070 RETVAL = self->max_size; 1188 RETVAL = self->max_size;
1071 OUTPUT: 1189 OUTPUT:
1072 RETVAL 1190 RETVAL
1073 1191
1074#if 0 //TODO 1192void filter (CBOR *self, SV *filter = 0)
1075
1076void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
1077 PPCODE: 1193 PPCODE:
1078{
1079 SvREFCNT_dec (self->cb_object); 1194 SvREFCNT_dec (self->filter);
1080 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0; 1195 self->filter = filter ? newSVsv (filter) : filter;
1081
1082 XPUSHs (ST (0)); 1196 XPUSHs (ST (0));
1083}
1084 1197
1085void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef) 1198SV *get_filter (CBOR *self)
1086 PPCODE: 1199 CODE:
1087{ 1200 RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1088 if (!self->cb_sk_object) 1201 OUTPUT:
1089 self->cb_sk_object = newHV (); 1202 RETVAL
1090
1091 if (SvOK (cb))
1092 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
1093 else
1094 {
1095 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
1096
1097 if (!HvKEYS (self->cb_sk_object))
1098 {
1099 SvREFCNT_dec (self->cb_sk_object);
1100 self->cb_sk_object = 0;
1101 }
1102 }
1103
1104 XPUSHs (ST (0));
1105}
1106
1107#endif
1108 1203
1109void encode (CBOR *self, SV *scalar) 1204void encode (CBOR *self, SV *scalar)
1110 PPCODE: 1205 PPCODE:
1111 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1206 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
1112 XPUSHs (scalar); 1207 XPUSHs (scalar);
… …
1126 PUSHs (sv); 1221 PUSHs (sv);
1127 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1222 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1128} 1223}
1129 1224
1130void DESTROY (CBOR *self) 1225void DESTROY (CBOR *self)
1131 CODE: 1226 PPCODE:
1132 SvREFCNT_dec (self->cb_sk_object); 1227 cbor_free (self);
1133 SvREFCNT_dec (self->cb_object);
1134 1228
1135PROTOTYPES: ENABLE 1229PROTOTYPES: ENABLE
1136 1230
1137void encode_cbor (SV *scalar) 1231void encode_cbor (SV *scalar)
1138 PPCODE: 1232 PPCODE:

Diff Legend

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