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.33 by root, Sat Nov 30 15:23:59 2013 UTC vs.
Revision 1.63 by root, Sat Nov 26 04:50:58 2016 UTC

… …
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
13#define ECB_NO_THREADS 1
12#include "ecb.h" 14#include "ecb.h"
13 15
14// compatibility with perl <5.18 16// compatibility with perl <5.18
15#ifndef HvNAMELEN_get 17#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv)) 18# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
… …
19# define HvNAMELEN(hv) HvNAMELEN_get (hv) 21# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20#endif 22#endif
21#ifndef HvNAMEUTF8 23#ifndef HvNAMEUTF8
22# define HvNAMEUTF8(hv) 0 24# define HvNAMEUTF8(hv) 0
23#endif 25#endif
26#ifndef SvREFCNT_inc_NN
27# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
28#endif
24#ifndef SvREFCNT_dec_NN 29#ifndef SvREFCNT_dec_NN
25# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv) 30# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
26#endif 31#endif
27 32
33// known major and minor types
34enum cbor_type
35{
36 MAJOR_SHIFT = 5,
37 MINOR_MASK = 0x1f,
38
39 MAJOR_POS_INT = 0 << MAJOR_SHIFT,
40 MAJOR_NEG_INT = 1 << MAJOR_SHIFT,
41 MAJOR_BYTES = 2 << MAJOR_SHIFT,
42 MAJOR_TEXT = 3 << MAJOR_SHIFT,
43 MAJOR_ARRAY = 4 << MAJOR_SHIFT,
44 MAJOR_MAP = 5 << MAJOR_SHIFT,
45 MAJOR_TAG = 6 << MAJOR_SHIFT,
46 MAJOR_MISC = 7 << MAJOR_SHIFT,
47
48 // INT/STRING/ARRAY/MAP subtypes
49 LENGTH_EXT1 = 24,
50 LENGTH_EXT2 = 25,
51 LENGTH_EXT4 = 26,
52 LENGTH_EXT8 = 27,
53
54 // SIMPLE types (effectively MISC subtypes)
55 SIMPLE_FALSE = 20,
56 SIMPLE_TRUE = 21,
57 SIMPLE_NULL = 22,
58 SIMPLE_UNDEF = 23,
59
60 // MISC subtype (unused)
61 MISC_EXT1 = 24,
62 MISC_FLOAT16 = 25,
63 MISC_FLOAT32 = 26,
64 MISC_FLOAT64 = 27,
65
66 // BYTES/TEXT/ARRAY/MAP
67 MINOR_INDEF = 31,
68};
69
28// known tags 70// known tags
29enum cbor_tag 71enum cbor_tag
30{ 72{
31 // extensions 73 // extensions
32 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref 74 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
33 CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object 75 CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
34 CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object 76 CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
35 CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing 77 CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
36 CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing 78 CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
37 CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref 79 CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
38 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection 80 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
39 81
40 // rfc7049 82 // rfc7049
41 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8 83 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
42 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any 84 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
43 CBOR_TAG_POS_BIGNUM = 2, // byte string 85 CBOR_TAG_POS_BIGNUM = 2, // byte string
44 CBOR_TAG_NEG_BIGNUM = 3, // byte string 86 CBOR_TAG_NEG_BIGNUM = 3, // byte string
45 CBOR_TAG_DECIMAL = 4, // decimal fraction, array 87 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
46 CBOR_TAG_BIGFLOAT = 5, // array 88 CBOR_TAG_BIGFLOAT = 5, // array
47 89
48 CBOR_TAG_CONV_B64U = 21, // base64url, any 90 CBOR_TAG_CONV_B64U = 21, // base64url, any
49 CBOR_TAG_CONV_B64 = 22, // base64, any 91 CBOR_TAG_CONV_B64 = 22, // base64, any
50 CBOR_TAG_CONV_HEX = 23, // base16, any 92 CBOR_TAG_CONV_HEX = 23, // base16, any
51 CBOR_TAG_CBOR = 24, // embedded cbor, byte string 93 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
52 94
53 CBOR_TAG_URI = 32, // URI rfc3986, utf-8 95 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
54 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8 96 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
55 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8 97 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
56 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8 98 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
57 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
58 100
59 CBOR_TAG_MAGIC = 55799 // self-describe cbor 101 CBOR_TAG_MAGIC = 55799, // self-describe cbor
60}; 102};
61 103
62#define F_SHRINK 0x00000001UL 104#define F_SHRINK 0x00000001UL
63#define F_ALLOW_UNKNOWN 0x00000002UL 105#define F_ALLOW_UNKNOWN 0x00000002UL
64#define F_ALLOW_SHARING 0x00000004UL 106#define F_ALLOW_SHARING 0x00000004UL
107#define F_ALLOW_CYCLES 0x00000008UL
108#define F_FORBID_OBJECTS 0x00000010UL
65#define F_PACK_STRINGS 0x00000008UL 109#define F_PACK_STRINGS 0x00000020UL
110#define F_TEXT_KEYS 0x00000040UL
111#define F_TEXT_STRINGS 0x00000080UL
112#define F_VALIDATE_UTF8 0x00000100UL
66 113
67#define INIT_SIZE 32 // initial scalar size to be allocated 114#define INIT_SIZE 32 // initial scalar size to be allocated
68 115
69#define SB do { 116#define SB do {
70#define SE } while (0) 117#define SE } while (0)
… …
89typedef struct { 136typedef struct {
90 U32 flags; 137 U32 flags;
91 U32 max_depth; 138 U32 max_depth;
92 STRLEN max_size; 139 STRLEN max_size;
93 SV *filter; 140 SV *filter;
141
142 // for the incremental parser
143 STRLEN incr_pos; // the current offset into the text
144 STRLEN incr_need; // minimum bytes needed to decode
145 AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
94} CBOR; 146} CBOR;
95 147
96ecb_inline void 148ecb_inline void
97cbor_init (CBOR *cbor) 149cbor_init (CBOR *cbor)
98{ 150{
… …
102 154
103ecb_inline void 155ecb_inline void
104cbor_free (CBOR *cbor) 156cbor_free (CBOR *cbor)
105{ 157{
106 SvREFCNT_dec (cbor->filter); 158 SvREFCNT_dec (cbor->filter);
159 SvREFCNT_dec (cbor->incr_count);
107} 160}
108 161
109///////////////////////////////////////////////////////////////////////////// 162/////////////////////////////////////////////////////////////////////////////
110// utility functions 163// utility functions
111 164
… …
137 190
138// minimum length of a string to be registered for stringref 191// minimum length of a string to be registered for stringref
139ecb_inline int 192ecb_inline int
140minimum_string_length (UV idx) 193minimum_string_length (UV idx)
141{ 194{
142 return idx > 23 195 return idx <= 23 ? 3
143 ? idx > 0xffU 196 : idx <= 0xffU ? 4
144 ? idx > 0xffffU 197 : idx <= 0xffffU ? 5
145 ? idx > 0xffffffffU 198 : idx <= 0xffffffffU ? 7
146 ? 11 199 : 11;
147 : 7
148 : 5
149 : 4
150 : 3;
151} 200}
152 201
153///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
154// encoder 203// encoder
155 204
… …
168} enc_t; 217} enc_t;
169 218
170ecb_inline void 219ecb_inline void
171need (enc_t *enc, STRLEN len) 220need (enc_t *enc, STRLEN len)
172{ 221{
173 if (ecb_expect_false (enc->cur + len >= enc->end)) 222 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
174 { 223 {
175 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 224 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
176 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 225 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
177 enc->cur = SvPVX (enc->sv) + cur; 226 enc->cur = SvPVX (enc->sv) + cur;
178 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
189static void 238static void
190encode_uint (enc_t *enc, int major, UV len) 239encode_uint (enc_t *enc, int major, UV len)
191{ 240{
192 need (enc, 9); 241 need (enc, 9);
193 242
194 if (ecb_expect_true (len < 24)) 243 if (ecb_expect_true (len < LENGTH_EXT1))
195 *enc->cur++ = major | len; 244 *enc->cur++ = major | len;
196 else if (ecb_expect_true (len <= 0xff)) 245 else if (ecb_expect_true (len <= 0xffU))
197 { 246 {
198 *enc->cur++ = major | 24; 247 *enc->cur++ = major | LENGTH_EXT1;
199 *enc->cur++ = len; 248 *enc->cur++ = len;
200 } 249 }
201 else if (len <= 0xffff) 250 else if (len <= 0xffffU)
202 { 251 {
203 *enc->cur++ = major | 25; 252 *enc->cur++ = major | LENGTH_EXT2;
204 *enc->cur++ = len >> 8; 253 *enc->cur++ = len >> 8;
205 *enc->cur++ = len; 254 *enc->cur++ = len;
206 } 255 }
207 else if (len <= 0xffffffff) 256 else if (len <= 0xffffffffU)
208 { 257 {
209 *enc->cur++ = major | 26; 258 *enc->cur++ = major | LENGTH_EXT4;
210 *enc->cur++ = len >> 24; 259 *enc->cur++ = len >> 24;
211 *enc->cur++ = len >> 16; 260 *enc->cur++ = len >> 16;
212 *enc->cur++ = len >> 8; 261 *enc->cur++ = len >> 8;
213 *enc->cur++ = len; 262 *enc->cur++ = len;
214 } 263 }
215 else 264 else
216 { 265 {
217 *enc->cur++ = major | 27; 266 *enc->cur++ = major | LENGTH_EXT8;
218 *enc->cur++ = len >> 56; 267 *enc->cur++ = len >> 56;
219 *enc->cur++ = len >> 48; 268 *enc->cur++ = len >> 48;
220 *enc->cur++ = len >> 40; 269 *enc->cur++ = len >> 40;
221 *enc->cur++ = len >> 32; 270 *enc->cur++ = len >> 32;
222 *enc->cur++ = len >> 24; 271 *enc->cur++ = len >> 24;
… …
227} 276}
228 277
229ecb_inline void 278ecb_inline void
230encode_tag (enc_t *enc, UV tag) 279encode_tag (enc_t *enc, UV tag)
231{ 280{
232 encode_uint (enc, 0xc0, tag); 281 encode_uint (enc, MAJOR_TAG, tag);
282}
283
284// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
285ecb_noinline static void
286encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
287{
288 STRLEN ulen = len;
289 U8 *p, *pend = (U8 *)str + len;
290
291 for (p = (U8 *)str; p < pend; ++p)
292 ulen += *p >> 7; // count set high bits
293
294 encode_uint (enc, MAJOR_TEXT, ulen);
295
296 need (enc, ulen);
297 for (p = (U8 *)str; p < pend; ++p)
298 if (*p < 0x80)
299 *enc->cur++ = *p;
300 else
301 {
302 *enc->cur++ = 0xc0 + (*p >> 6);
303 *enc->cur++ = 0x80 + (*p & 63);
304 }
233} 305}
234 306
235ecb_inline void 307ecb_inline void
236encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 308encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
237{ 309{
238 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 310 if (ecb_expect_false (upgrade_utf8))
311 if (!utf8)
312 {
313 encode_str_utf8 (enc, utf8, str, len);
314 return;
315 }
316
317 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
239 need (enc, len); 318 need (enc, len);
240 memcpy (enc->cur, str, len); 319 memcpy (enc->cur, str, len);
241 enc->cur += len; 320 enc->cur += len;
242} 321}
243 322
244static void 323ecb_inline void
245encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 324encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
246{ 325{
247 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 326 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
248 { 327 {
249 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 328 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
250 329
251 if (SvOK (*svp)) 330 if (SvOK (*svp))
252 { 331 {
253 // already registered, use stringref 332 // already registered, use stringref
254 encode_tag (enc, CBOR_TAG_STRINGREF); 333 encode_tag (enc, CBOR_TAG_STRINGREF);
255 encode_uint (enc, 0x00, SvUV (*svp)); 334 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
256 return; 335 return;
257 } 336 }
258 else if (len >= minimum_string_length (enc->stringref_idx)) 337 else if (len >= minimum_string_length (enc->stringref_idx))
259 { 338 {
260 // register only 339 // register only
261 sv_setuv (*svp, enc->stringref_idx); 340 sv_setuv (*svp, enc->stringref_idx);
262 ++enc->stringref_idx; 341 ++enc->stringref_idx;
263 } 342 }
264 } 343 }
265 344
266 encode_str (enc, utf8, str, len); 345 encode_str (enc, upgrade_utf8, utf8, str, len);
267} 346}
268 347
269static void encode_sv (enc_t *enc, SV *sv); 348static void encode_sv (enc_t *enc, SV *sv);
270 349
271static void 350static void
… …
276 if (enc->depth >= enc->cbor.max_depth) 355 if (enc->depth >= enc->cbor.max_depth)
277 croak (ERR_NESTING_EXCEEDED); 356 croak (ERR_NESTING_EXCEEDED);
278 357
279 ++enc->depth; 358 ++enc->depth;
280 359
281 encode_uint (enc, 0x80, len + 1); 360 encode_uint (enc, MAJOR_ARRAY, len + 1);
282 361
362 if (ecb_expect_false (SvMAGICAL (av)))
283 for (i = 0; i <= len; ++i) 363 for (i = 0; i <= len; ++i)
284 { 364 {
285 SV **svp = av_fetch (av, i, 0); 365 SV **svp = av_fetch (av, i, 0);
286 encode_sv (enc, svp ? *svp : &PL_sv_undef); 366 encode_sv (enc, svp ? *svp : &PL_sv_undef);
287 } 367 }
368 else
369 for (i = 0; i <= len; ++i)
370 {
371 SV *sv = AvARRAY (av)[i];
372 encode_sv (enc, sv ? sv : &PL_sv_undef);
373 }
288 374
289 --enc->depth; 375 --enc->depth;
290} 376}
291 377
292static void 378static void
… …
300 ++enc->depth; 386 ++enc->depth;
301 387
302 int pairs = hv_iterinit (hv); 388 int pairs = hv_iterinit (hv);
303 int mg = SvMAGICAL (hv); 389 int mg = SvMAGICAL (hv);
304 390
305 if (mg) 391 if (ecb_expect_false (mg))
306 encode_ch (enc, 0xa0 | 31); 392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
307 else 393 else
308 encode_uint (enc, 0xa0, pairs); 394 encode_uint (enc, MAJOR_MAP, pairs);
309 395
310 while ((he = hv_iternext (hv))) 396 while ((he = hv_iternext (hv)))
311 { 397 {
312 if (HeKLEN (he) == HEf_SVKEY) 398 if (HeKLEN (he) == HEf_SVKEY)
313 encode_sv (enc, HeSVKEY (he)); 399 encode_sv (enc, HeSVKEY (he));
314 else 400 else
315 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 401 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
316 402
317 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 403 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
318 } 404 }
319 405
320 if (mg) 406 if (ecb_expect_false (mg))
321 encode_ch (enc, 0xe0 | 31); 407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
322 408
323 --enc->depth; 409 --enc->depth;
324} 410}
325 411
326// encode objects, arrays and special \0=false and \1=true values. 412// encode objects, arrays and special \0=false and \1=true values.
… …
342 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 428 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
343 ? cbor_tagged_stash 429 ? cbor_tagged_stash
344 : gv_stashpv ("CBOR::XS::Tagged" , 1); 430 : gv_stashpv ("CBOR::XS::Tagged" , 1);
345 431
346 HV *stash = SvSTASH (sv); 432 HV *stash = SvSTASH (sv);
347 GV *method;
348 433
349 if (stash == boolean_stash) 434 if (stash == boolean_stash)
350 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 435 {
436 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
437 return;
438 }
351 else if (stash == error_stash) 439 else if (stash == error_stash)
352 encode_ch (enc, 0xe0 | 23); 440 {
441 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
442 return;
443 }
353 else if (stash == tagged_stash) 444 else if (stash == tagged_stash)
354 { 445 {
355 if (svt != SVt_PVAV) 446 if (svt != SVt_PVAV)
356 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 447 croak ("encountered CBOR::XS::Tagged object that isn't an array");
357 448
358 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 449 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
359 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 450 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
451
452 return;
453 }
454 }
455
456 if (ecb_expect_false (SvREFCNT (sv) > 1)
457 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
458 {
459 if (ecb_expect_false (!enc->shareable))
460 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
461
462 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
463
464 if (SvOK (*svp))
360 } 465 {
466 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
467 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
468 return;
469 }
470 else
471 {
472 sv_setuv (*svp, enc->shareable_idx);
473 ++enc->shareable_idx;
474 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
475 }
476 }
477
478 if (ecb_expect_false (SvOBJECT (sv)))
479 {
480 HV *stash = SvSTASH (sv);
481 GV *method;
482
483 if (enc->cbor.flags & F_FORBID_OBJECTS)
484 croak ("encountered object '%s', but forbid_objects is enabled",
485 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
361 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 486 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
362 { 487 {
363 dSP; 488 dSP;
364 489
365 ENTER; SAVETMPS; PUSHMARK (SP); 490 ENTER; SAVETMPS;
491 PUSHMARK (SP);
366 // we re-bless the reference to get overload and other niceties right 492 // we re-bless the reference to get overload and other niceties right
367 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 493 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
368 494
369 PUTBACK; 495 PUTBACK;
370 // G_SCALAR ensures that return value is 1 496 // G_SCALAR ensures that return value is 1
… …
383 } 509 }
384 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
385 { 511 {
386 dSP; 512 dSP;
387 513
388 ENTER; SAVETMPS; PUSHMARK (SP); 514 ENTER; SAVETMPS;
515 SAVESTACK_POS ();
516 PUSHMARK (SP);
389 EXTEND (SP, 2); 517 EXTEND (SP, 2);
390 // we re-bless the reference to get overload and other niceties right 518 // we re-bless the reference to get overload and other niceties right
391 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 519 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
392 PUSHs (sv_cbor); 520 PUSHs (sv_cbor);
393 521
… …
398 // catch this surprisingly common error 526 // catch this surprisingly common error
399 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 527 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
400 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 528 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
401 529
402 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 530 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
403 encode_uint (enc, 0x80, count + 1); 531 encode_uint (enc, MAJOR_ARRAY, count + 1);
404 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 532 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
405 533
406 while (count) 534 while (count)
407 encode_sv (enc, SP[1 - count--]); 535 encode_sv (enc, SP[1 - count--]);
408 536
409 PUTBACK; 537 PUTBACK;
… …
418 encode_hv (enc, (HV *)sv); 546 encode_hv (enc, (HV *)sv);
419 else if (svt == SVt_PVAV) 547 else if (svt == SVt_PVAV)
420 encode_av (enc, (AV *)sv); 548 encode_av (enc, (AV *)sv);
421 else 549 else
422 { 550 {
423 if (ecb_expect_false (SvREFCNT (sv) > 1)
424 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
425 {
426 if (!enc->shareable)
427 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
428
429 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
430
431 if (SvOK (*svp))
432 {
433 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
434 encode_uint (enc, 0x00, SvUV (*svp));
435 return;
436 }
437 else
438 {
439 sv_setuv (*svp, enc->shareable_idx);
440 ++enc->shareable_idx;
441 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
442 }
443 }
444
445 encode_tag (enc, CBOR_TAG_INDIRECTION); 551 encode_tag (enc, CBOR_TAG_INDIRECTION);
446 encode_sv (enc, sv); 552 encode_sv (enc, sv);
447 } 553 }
448} 554}
449 555
… …
452{ 558{
453 double nv = SvNVX (sv); 559 double nv = SvNVX (sv);
454 560
455 need (enc, 9); 561 need (enc, 9);
456 562
457 if (ecb_expect_false (nv == (U32)nv)) 563 if (ecb_expect_false (nv == (NV)(U32)nv))
458 encode_uint (enc, 0x00, (U32)nv); 564 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
459 //TODO: maybe I32? 565 //TODO: maybe I32?
460 else if (ecb_expect_false (nv == (float)nv)) 566 else if (ecb_expect_false (nv == (float)nv))
461 { 567 {
568 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
569
462 uint32_t fp = ecb_float_to_binary32 (nv); 570 uint32_t fp = ecb_float_to_binary32 (nv);
463
464 *enc->cur++ = 0xe0 | 26;
465 571
466 if (!ecb_big_endian ()) 572 if (!ecb_big_endian ())
467 fp = ecb_bswap32 (fp); 573 fp = ecb_bswap32 (fp);
468 574
469 memcpy (enc->cur, &fp, 4); 575 memcpy (enc->cur, &fp, 4);
470 enc->cur += 4; 576 enc->cur += 4;
471 } 577 }
472 else 578 else
473 { 579 {
580 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
581
474 uint64_t fp = ecb_double_to_binary64 (nv); 582 uint64_t fp = ecb_double_to_binary64 (nv);
475
476 *enc->cur++ = 0xe0 | 27;
477 583
478 if (!ecb_big_endian ()) 584 if (!ecb_big_endian ())
479 fp = ecb_bswap64 (fp); 585 fp = ecb_bswap64 (fp);
480 586
481 memcpy (enc->cur, &fp, 8); 587 memcpy (enc->cur, &fp, 8);
… …
490 596
491 if (SvPOKp (sv)) 597 if (SvPOKp (sv))
492 { 598 {
493 STRLEN len; 599 STRLEN len;
494 char *str = SvPV (sv, len); 600 char *str = SvPV (sv, len);
495 encode_strref (enc, SvUTF8 (sv), str, len); 601 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
496 } 602 }
497 else if (SvNOKp (sv)) 603 else if (SvNOKp (sv))
498 encode_nv (enc, sv); 604 encode_nv (enc, sv);
499 else if (SvIOKp (sv)) 605 else if (SvIOKp (sv))
500 { 606 {
501 if (SvIsUV (sv)) 607 if (SvIsUV (sv))
502 encode_uint (enc, 0x00, SvUVX (sv)); 608 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
503 else if (SvIVX (sv) >= 0) 609 else if (SvIVX (sv) >= 0)
504 encode_uint (enc, 0x00, SvIVX (sv)); 610 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
505 else 611 else
506 encode_uint (enc, 0x20, -(SvIVX (sv) + 1)); 612 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
507 } 613 }
508 else if (SvROK (sv)) 614 else if (SvROK (sv))
509 encode_rv (enc, SvRV (sv)); 615 encode_rv (enc, SvRV (sv));
510 else if (!SvOK (sv)) 616 else if (!SvOK (sv))
511 encode_ch (enc, 0xe0 | 22); 617 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
512 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 618 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
513 encode_ch (enc, 0xe0 | 23); 619 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
514 else 620 else
515 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data", 621 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
516 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 622 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
517} 623}
518 624
519static SV * 625static SV *
520encode_cbor (SV *scalar, CBOR *cbor) 626encode_cbor (SV *scalar, CBOR *cbor)
521{ 627{
522 enc_t enc = { }; 628 enc_t enc = { 0 };
523 629
524 enc.cbor = *cbor; 630 enc.cbor = *cbor;
525 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 631 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
526 enc.cur = SvPVX (enc.sv); 632 enc.cur = SvPVX (enc.sv);
527 enc.end = SvEND (enc.sv); 633 enc.end = SvEND (enc.sv);
528 634
529 SvPOK_only (enc.sv); 635 SvPOK_only (enc.sv);
530 636
531 if (cbor->flags & F_PACK_STRINGS) 637 if (cbor->flags & F_PACK_STRINGS)
532 { 638 {
… …
559 U32 depth; // recursion depth 665 U32 depth; // recursion depth
560 U32 maxdepth; // recursion depth limit 666 U32 maxdepth; // recursion depth limit
561 AV *shareable; 667 AV *shareable;
562 AV *stringref; 668 AV *stringref;
563 SV *decode_tagged; 669 SV *decode_tagged;
670 SV *err_sv; // optional sv for error, needs to be freed
564} dec_t; 671} dec_t;
565 672
566#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 673// set dec->err to ERRSV
674ecb_cold static void
675err_errsv (dec_t *dec)
676{
677 if (!dec->err)
678 {
679 dec->err_sv = newSVsv (ERRSV);
567 680
568#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 681 // chop off the trailing \n
682 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
683 *SvEND (dec->err_sv) = 0;
569 684
685 dec->err = SvPVutf8_nolen (dec->err_sv);
686 }
687}
688
689// the following functions are used to reduce code size and help the compiler to optimise
690ecb_cold static void
691err_set (dec_t *dec, const char *reason)
692{
693 if (!dec->err)
694 dec->err = reason;
695}
696
697ecb_cold static void
698err_unexpected_end (dec_t *dec)
699{
700 err_set (dec, "unexpected end of CBOR data");
701}
702
703#define ERR_DO(do) SB do; goto fail; SE
704#define ERR(reason) ERR_DO (err_set (dec, reason))
705#define ERR_ERRSV ERR_DO (err_errsv (dec))
706
707#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
708
570#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 709#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
571#define DEC_DEC_DEPTH --dec->depth 710#define DEC_DEC_DEPTH --dec->depth
572 711
573static UV 712static UV
574decode_uint (dec_t *dec) 713decode_uint (dec_t *dec)
575{ 714{
576 switch (*dec->cur & 31) 715 U8 m = *dec->cur & MINOR_MASK;
577 { 716 ++dec->cur;
578 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
579 case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
580 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
581 return *dec->cur++ & 31;
582 717
583 case 24: 718 if (ecb_expect_true (m < LENGTH_EXT1))
719 return m;
720 else if (ecb_expect_true (m == LENGTH_EXT1))
721 {
584 WANT (2); 722 WANT (1);
585 dec->cur += 2; 723 dec->cur += 1;
586 return dec->cur[-1]; 724 return dec->cur[-1];
587 725 }
588 case 25: 726 else if (ecb_expect_true (m == LENGTH_EXT2))
727 {
589 WANT (3); 728 WANT (2);
590 dec->cur += 3; 729 dec->cur += 2;
591 return (((UV)dec->cur[-2]) << 8) 730 return (((UV)dec->cur[-2]) << 8)
592 | ((UV)dec->cur[-1]); 731 | ((UV)dec->cur[-1]);
593 732 }
594 case 26: 733 else if (ecb_expect_true (m == LENGTH_EXT4))
734 {
595 WANT (5); 735 WANT (4);
596 dec->cur += 5; 736 dec->cur += 4;
597 return (((UV)dec->cur[-4]) << 24) 737 return (((UV)dec->cur[-4]) << 24)
598 | (((UV)dec->cur[-3]) << 16) 738 | (((UV)dec->cur[-3]) << 16)
599 | (((UV)dec->cur[-2]) << 8) 739 | (((UV)dec->cur[-2]) << 8)
600 | ((UV)dec->cur[-1]); 740 | ((UV)dec->cur[-1]);
601 741 }
602 case 27: 742 else if (ecb_expect_true (m == LENGTH_EXT8))
743 {
603 WANT (9); 744 WANT (8);
604 dec->cur += 9; 745 dec->cur += 8;
746
747 return
748#if UVSIZE < 8
749 0
750#else
605 return (((UV)dec->cur[-8]) << 56) 751 (((UV)dec->cur[-8]) << 56)
606 | (((UV)dec->cur[-7]) << 48) 752 | (((UV)dec->cur[-7]) << 48)
607 | (((UV)dec->cur[-6]) << 40) 753 | (((UV)dec->cur[-6]) << 40)
608 | (((UV)dec->cur[-5]) << 32) 754 | (((UV)dec->cur[-5]) << 32)
755#endif
609 | (((UV)dec->cur[-4]) << 24) 756 | (((UV)dec->cur[-4]) << 24)
610 | (((UV)dec->cur[-3]) << 16) 757 | (((UV)dec->cur[-3]) << 16)
611 | (((UV)dec->cur[-2]) << 8) 758 | (((UV)dec->cur[-2]) << 8)
612 | ((UV)dec->cur[-1]); 759 | ((UV)dec->cur[-1]);
613 760 }
614 default: 761 else
615 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 762 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
616 }
617 763
618fail: 764fail:
619 return 0; 765 return 0;
620} 766}
621 767
… …
626{ 772{
627 AV *av = newAV (); 773 AV *av = newAV ();
628 774
629 DEC_INC_DEPTH; 775 DEC_INC_DEPTH;
630 776
631 if ((*dec->cur & 31) == 31) 777 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
632 { 778 {
633 ++dec->cur; 779 ++dec->cur;
634 780
635 for (;;) 781 for (;;)
636 { 782 {
637 WANT (1); 783 WANT (1);
638 784
639 if (*dec->cur == (0xe0 | 31)) 785 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
640 { 786 {
641 ++dec->cur; 787 ++dec->cur;
642 break; 788 break;
643 } 789 }
644 790
645 av_push (av, decode_sv (dec)); 791 av_push (av, decode_sv (dec));
646 } 792 }
647 } 793 }
648 else 794 else
649 { 795 {
650 int i, len = decode_uint (dec); 796 UV i, len = decode_uint (dec);
651 797
798 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
652 av_fill (av, len - 1); 799 av_fill (av, len - 1);
653 800
654 for (i = 0; i < len; ++i) 801 for (i = 0; i < len; ++i)
655 AvARRAY (av)[i] = decode_sv (dec); 802 AvARRAY (av)[i] = decode_sv (dec);
656 } 803 }
657 804
658 DEC_DEC_DEPTH; 805 DEC_DEC_DEPTH;
659 return newRV_noinc ((SV *)av); 806 return newRV_noinc ((SV *)av);
660 807
661fail: 808fail:
662 SvREFCNT_dec (av); 809 SvREFCNT_dec_NN (av);
663 DEC_DEC_DEPTH; 810 DEC_DEC_DEPTH;
664 return &PL_sv_undef; 811 return &PL_sv_undef;
665} 812}
666 813
667static void 814static void
… …
669{ 816{
670 // for speed reasons, we specialcase single-string 817 // for speed reasons, we specialcase single-string
671 // byte or utf-8 strings as keys, but only when !stringref 818 // byte or utf-8 strings as keys, but only when !stringref
672 819
673 if (ecb_expect_true (!dec->stringref)) 820 if (ecb_expect_true (!dec->stringref))
674 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27) 821 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
675 { 822 {
676 I32 len = decode_uint (dec); 823 STRLEN len = decode_uint (dec);
677 char *key = (char *)dec->cur; 824 char *key = (char *)dec->cur;
678 825
826 WANT (len);
679 dec->cur += len; 827 dec->cur += len;
680 828
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); 829 hv_store (hv, key, len, decode_sv (dec), 0);
685 830
686 return; 831 return;
687 } 832 }
688 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27) 833 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
689 { 834 {
690 I32 len = decode_uint (dec); 835 STRLEN len = decode_uint (dec);
691 char *key = (char *)dec->cur; 836 char *key = (char *)dec->cur;
692 837
838 WANT (len);
693 dec->cur += len; 839 dec->cur += len;
694 840
695 if (ecb_expect_false (dec->stringref)) 841 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
696 av_push (dec->stringref, newSVpvn_utf8 (key, len, 1)); 842 if (!is_utf8_string (key, len))
843 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
697 844
698 hv_store (hv, key, -len, decode_sv (dec), 0); 845 hv_store (hv, key, -len, decode_sv (dec), 0);
699 846
700 return; 847 return;
701 } 848 }
702 849
703 SV *k = decode_sv (dec); 850 SV *k = decode_sv (dec);
704 SV *v = decode_sv (dec); 851 SV *v = decode_sv (dec);
705 852
853 // we leak memory if uncaught exceptions are thrown by random magical
854 // methods, and this is hopefully the only place where it can happen,
855 // so if there is a chance of an exception, take the very slow path.
856 // since catching exceptions is "undocumented/internal/forbidden" by
857 // the new p5p powers, we need to call out to a perl function :/
858 if (ecb_expect_false (SvAMAGIC (k)))
859 {
860 dSP;
861
862 ENTER; SAVETMPS;
863 PUSHMARK (SP);
864 EXTEND (SP, 3);
865 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
866 PUSHs (sv_2mortal (k));
867 PUSHs (sv_2mortal (v));
868
869 PUTBACK;
870 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
871 SPAGAIN;
872
873 FREETMPS; LEAVE;
874
875 if (SvTRUE (ERRSV))
876 ERR_ERRSV;
877
878 return;
879 }
880
706 hv_store_ent (hv, k, v, 0); 881 hv_store_ent (hv, k, v, 0);
707 SvREFCNT_dec (k); 882 SvREFCNT_dec_NN (k);
883
884fail:
885 ;
708} 886}
709 887
710static SV * 888static SV *
711decode_hv (dec_t *dec) 889decode_hv (dec_t *dec)
712{ 890{
713 HV *hv = newHV (); 891 HV *hv = newHV ();
714 892
715 DEC_INC_DEPTH; 893 DEC_INC_DEPTH;
716 894
717 if ((*dec->cur & 31) == 31) 895 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
718 { 896 {
719 ++dec->cur; 897 ++dec->cur;
720 898
721 for (;;) 899 for (;;)
722 { 900 {
723 WANT (1); 901 WANT (1);
724 902
725 if (*dec->cur == (0xe0 | 31)) 903 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
726 { 904 {
727 ++dec->cur; 905 ++dec->cur;
728 break; 906 break;
729 } 907 }
730 908
731 decode_he (dec, hv); 909 decode_he (dec, hv);
732 } 910 }
733 } 911 }
734 else 912 else
735 { 913 {
736 int pairs = decode_uint (dec); 914 UV pairs = decode_uint (dec);
915
916 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
737 917
738 while (pairs--) 918 while (pairs--)
739 decode_he (dec, hv); 919 decode_he (dec, hv);
740 } 920 }
741 921
742 DEC_DEC_DEPTH; 922 DEC_DEC_DEPTH;
743 return newRV_noinc ((SV *)hv); 923 return newRV_noinc ((SV *)hv);
744 924
745fail: 925fail:
746 SvREFCNT_dec (hv); 926 SvREFCNT_dec_NN (hv);
747 DEC_DEC_DEPTH; 927 DEC_DEC_DEPTH;
748 return &PL_sv_undef; 928 return &PL_sv_undef;
749} 929}
750 930
751static SV * 931static SV *
752decode_str (dec_t *dec, int utf8) 932decode_str (dec_t *dec, int utf8)
753{ 933{
754 SV *sv = 0; 934 SV *sv = 0;
755 935
756 if ((*dec->cur & 31) == 31) 936 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
757 { 937 {
758 // indefinite length strings 938 // indefinite length strings
759 ++dec->cur; 939 ++dec->cur;
760 940
761 unsigned char major = *dec->cur & 0xe0; 941 U8 major = *dec->cur & MAJOR_MISC;
762 942
763 sv = newSVpvn ("", 0); 943 sv = newSVpvn ("", 0);
764 944
765 for (;;) 945 for (;;)
766 { 946 {
767 WANT (1); 947 WANT (1);
768 948
769 if ((*dec->cur ^ major) >= 31) 949 if ((*dec->cur - major) > LENGTH_EXT8)
770 if (*dec->cur == (0xe0 | 31)) 950 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
771 { 951 {
772 ++dec->cur; 952 ++dec->cur;
773 break; 953 break;
774 } 954 }
775 else 955 else
… …
794 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1)) 974 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
795 av_push (dec->stringref, SvREFCNT_inc_NN (sv)); 975 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
796 } 976 }
797 977
798 if (utf8) 978 if (utf8)
979 {
980 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
981 if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
982 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
983
799 SvUTF8_on (sv); 984 SvUTF8_on (sv);
985 }
800 986
801 return sv; 987 return sv;
802 988
803fail: 989fail:
804 SvREFCNT_dec (sv); 990 SvREFCNT_dec (sv);
… …
823 sv = newRV_noinc (decode_sv (dec)); 1009 sv = newRV_noinc (decode_sv (dec));
824 break; 1010 break;
825 1011
826 case CBOR_TAG_STRINGREF_NAMESPACE: 1012 case CBOR_TAG_STRINGREF_NAMESPACE:
827 { 1013 {
1014 // do not use SAVETMPS/FREETMPS, as these will
1015 // erase mortalised caches, e.g. "shareable"
828 ENTER; SAVETMPS; 1016 ENTER;
829 1017
830 SAVESPTR (dec->stringref); 1018 SAVESPTR (dec->stringref);
831 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1019 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
832 1020
833 sv = decode_sv (dec); 1021 sv = decode_sv (dec);
834 1022
835 FREETMPS; LEAVE; 1023 LEAVE;
836 } 1024 }
837 break; 1025 break;
838 1026
839 case CBOR_TAG_STRINGREF: 1027 case CBOR_TAG_STRINGREF:
840 { 1028 {
841 if ((*dec->cur >> 5) != 0) 1029 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
842 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1030 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
843 1031
844 UV idx = decode_uint (dec); 1032 UV idx = decode_uint (dec);
845 1033
846 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1034 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))
… …
853 case CBOR_TAG_VALUE_SHAREABLE: 1041 case CBOR_TAG_VALUE_SHAREABLE:
854 { 1042 {
855 if (ecb_expect_false (!dec->shareable)) 1043 if (ecb_expect_false (!dec->shareable))
856 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ()); 1044 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
857 1045
1046 if (dec->cbor.flags & F_ALLOW_CYCLES)
1047 {
858 sv = newSV (0); 1048 sv = newSV (0);
859 av_push (dec->shareable, SvREFCNT_inc_NN (sv)); 1049 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
860 1050
861 SV *osv = decode_sv (dec); 1051 SV *osv = decode_sv (dec);
862 sv_setsv (sv, osv); 1052 sv_setsv (sv, osv);
863 SvREFCNT_dec_NN (osv); 1053 SvREFCNT_dec_NN (osv);
1054 }
1055 else
1056 {
1057 av_push (dec->shareable, &PL_sv_undef);
1058 int idx = AvFILLp (dec->shareable);
1059 sv = decode_sv (dec);
1060 av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
1061 }
864 } 1062 }
865 break; 1063 break;
866 1064
867 case CBOR_TAG_VALUE_SHAREDREF: 1065 case CBOR_TAG_VALUE_SHAREDREF:
868 { 1066 {
869 if ((*dec->cur >> 5) != 0) 1067 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
870 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1068 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
871 1069
872 UV idx = decode_uint (dec); 1070 UV idx = decode_uint (dec);
873 1071
874 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1072 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))
875 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1073 ERR ("corrupted CBOR data (sharedref index out of bounds)");
876 1074
877 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1075 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1076
1077 if (sv == &PL_sv_undef)
1078 ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
878 } 1079 }
879 break; 1080 break;
880 1081
881 case CBOR_TAG_PERL_OBJECT: 1082 case CBOR_TAG_PERL_OBJECT:
882 { 1083 {
1084 if (dec->cbor.flags & F_FORBID_OBJECTS)
1085 goto filter;
1086
883 sv = decode_sv (dec); 1087 sv = decode_sv (dec);
884 1088
885 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1089 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
886 ERR ("corrupted CBOR data (non-array perl object)"); 1090 ERR ("corrupted CBOR data (non-array perl object)");
887 1091
… …
897 if (!method) 1101 if (!method)
898 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1102 ERR ("cannot decode perl-object (package does not have a THAW method)");
899 1103
900 dSP; 1104 dSP;
901 1105
902 ENTER; SAVETMPS; PUSHMARK (SP); 1106 ENTER; SAVETMPS;
1107 PUSHMARK (SP);
903 EXTEND (SP, len + 1); 1108 EXTEND (SP, len + 1);
904 // we re-bless the reference to get overload and other niceties right 1109 // we re-bless the reference to get overload and other niceties right
905 PUSHs (*av_fetch (av, 0, 1)); 1110 PUSHs (*av_fetch (av, 0, 1));
906 PUSHs (sv_cbor); 1111 PUSHs (sv_cbor);
907 1112
… …
915 SPAGAIN; 1120 SPAGAIN;
916 1121
917 if (SvTRUE (ERRSV)) 1122 if (SvTRUE (ERRSV))
918 { 1123 {
919 FREETMPS; LEAVE; 1124 FREETMPS; LEAVE;
920 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1125 ERR_ERRSV;
921 } 1126 }
922 1127
923 SvREFCNT_dec (sv); 1128 SvREFCNT_dec_NN (sv);
924 sv = SvREFCNT_inc (POPs); 1129 sv = SvREFCNT_inc (POPs);
925 1130
926 PUTBACK; 1131 PUTBACK;
927 1132
928 FREETMPS; LEAVE; 1133 FREETMPS; LEAVE;
929 } 1134 }
930 break; 1135 break;
931 1136
932 default: 1137 default:
1138 filter:
933 { 1139 {
1140 SV *tag_sv = newSVuv (tag);
1141
934 sv = decode_sv (dec); 1142 sv = decode_sv (dec);
935 1143
936 dSP; 1144 dSP;
937 ENTER; SAVETMPS; PUSHMARK (SP); 1145 ENTER; SAVETMPS;
1146 SAVESTACK_POS ();
1147 PUSHMARK (SP);
938 EXTEND (SP, 2); 1148 EXTEND (SP, 2);
939 PUSHs (newSVuv (tag)); 1149 PUSHs (tag_sv);
940 PUSHs (sv); 1150 PUSHs (sv);
941 1151
942 PUTBACK; 1152 PUTBACK;
943 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1153 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
944 SPAGAIN; 1154 SPAGAIN;
945 1155
946 if (SvTRUE (ERRSV)) 1156 if (SvTRUE (ERRSV))
947 { 1157 {
1158 SvREFCNT_dec_NN (tag_sv);
948 FREETMPS; LEAVE; 1159 FREETMPS; LEAVE;
949 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1160 ERR_ERRSV;
950 } 1161 }
951 1162
952 if (count) 1163 if (count)
953 { 1164 {
1165 SvREFCNT_dec_NN (tag_sv);
954 SvREFCNT_dec (sv); 1166 SvREFCNT_dec_NN (sv);
955 sv = SvREFCNT_inc (POPs); 1167 sv = SvREFCNT_inc_NN (POPs);
956 } 1168 }
957 else 1169 else
958 { 1170 {
959 AV *av = newAV (); 1171 AV *av = newAV ();
960 av_push (av, newSVuv (tag)); 1172 av_push (av, tag_sv);
961 av_push (av, sv); 1173 av_push (av, sv);
962 1174
963 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1175 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
964 ? cbor_tagged_stash 1176 ? cbor_tagged_stash
965 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1177 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
983static SV * 1195static SV *
984decode_sv (dec_t *dec) 1196decode_sv (dec_t *dec)
985{ 1197{
986 WANT (1); 1198 WANT (1);
987 1199
988 switch (*dec->cur >> 5) 1200 switch (*dec->cur >> MAJOR_SHIFT)
989 { 1201 {
990 case 0: // unsigned int 1202 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
991 return newSVuv (decode_uint (dec)); 1203 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
992 case 1: // negative int 1204 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
993 return newSViv (-1 - (IV)decode_uint (dec)); 1205 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
994 case 2: // octet string 1206 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
995 return decode_str (dec, 0); 1207 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
996 case 3: // utf-8 string 1208 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
997 return decode_str (dec, 1); 1209
998 case 4: // array 1210 case MAJOR_MISC >> MAJOR_SHIFT:
999 return decode_av (dec);
1000 case 5: // map
1001 return decode_hv (dec);
1002 case 6: // tag
1003 return decode_tagged (dec);
1004 case 7: // misc
1005 switch (*dec->cur++ & 31) 1211 switch (*dec->cur++ & MINOR_MASK)
1006 { 1212 {
1007 case 20: 1213 case SIMPLE_FALSE:
1008#if CBOR_SLOW 1214#if CBOR_SLOW
1009 types_false = get_bool ("Types::Serialiser::false"); 1215 types_false = get_bool ("Types::Serialiser::false");
1010#endif 1216#endif
1011 return newSVsv (types_false); 1217 return newSVsv (types_false);
1012 case 21: 1218 case SIMPLE_TRUE:
1013#if CBOR_SLOW 1219#if CBOR_SLOW
1014 types_true = get_bool ("Types::Serialiser::true"); 1220 types_true = get_bool ("Types::Serialiser::true");
1015#endif 1221#endif
1016 return newSVsv (types_true); 1222 return newSVsv (types_true);
1017 case 22: 1223 case SIMPLE_NULL:
1018 return newSVsv (&PL_sv_undef); 1224 return newSVsv (&PL_sv_undef);
1019 case 23: 1225 case SIMPLE_UNDEF:
1020#if CBOR_SLOW 1226#if CBOR_SLOW
1021 types_error = get_bool ("Types::Serialiser::error"); 1227 types_error = get_bool ("Types::Serialiser::error");
1022#endif 1228#endif
1023 return newSVsv (types_error); 1229 return newSVsv (types_error);
1024 1230
1025 case 25: 1231 case MISC_FLOAT16:
1026 { 1232 {
1027 WANT (2); 1233 WANT (2);
1028 1234
1029 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1235 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
1030 dec->cur += 2; 1236 dec->cur += 2;
1031 1237
1032 return newSVnv (ecb_binary16_to_float (fp)); 1238 return newSVnv (ecb_binary16_to_float (fp));
1033 } 1239 }
1034 1240
1035 case 26: 1241 case MISC_FLOAT32:
1036 { 1242 {
1037 uint32_t fp; 1243 uint32_t fp;
1038 WANT (4); 1244 WANT (4);
1039 memcpy (&fp, dec->cur, 4); 1245 memcpy (&fp, dec->cur, 4);
1040 dec->cur += 4; 1246 dec->cur += 4;
… …
1043 fp = ecb_bswap32 (fp); 1249 fp = ecb_bswap32 (fp);
1044 1250
1045 return newSVnv (ecb_binary32_to_float (fp)); 1251 return newSVnv (ecb_binary32_to_float (fp));
1046 } 1252 }
1047 1253
1048 case 27: 1254 case MISC_FLOAT64:
1049 { 1255 {
1050 uint64_t fp; 1256 uint64_t fp;
1051 WANT (8); 1257 WANT (8);
1052 memcpy (&fp, dec->cur, 8); 1258 memcpy (&fp, dec->cur, 8);
1053 dec->cur += 8; 1259 dec->cur += 8;
… …
1056 fp = ecb_bswap64 (fp); 1262 fp = ecb_bswap64 (fp);
1057 1263
1058 return newSVnv (ecb_binary64_to_double (fp)); 1264 return newSVnv (ecb_binary64_to_double (fp));
1059 } 1265 }
1060 1266
1061 // 0..19 unassigned 1267 // 0..19 unassigned simple
1062 // 24 reserved + unassigned (reserved values are not encodable) 1268 // 24 reserved + unassigned simple (reserved values are not encodable)
1269 // 28-30 unassigned misc
1270 // 31 break code
1063 default: 1271 default:
1064 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1272 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1065 } 1273 }
1066 1274
1067 break; 1275 break;
1068 } 1276 }
1069 1277
… …
1072} 1280}
1073 1281
1074static SV * 1282static SV *
1075decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1283decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1076{ 1284{
1077 dec_t dec = { }; 1285 dec_t dec = { 0 };
1078 SV *sv; 1286 SV *sv;
1079 STRLEN len; 1287 STRLEN len;
1080 char *data = SvPVbyte (string, len); 1288 char *data = SvPVbyte (string, len);
1081 1289
1082 if (len > cbor->max_size && cbor->max_size) 1290 if (len > cbor->max_size && cbor->max_size)
… …
1096 if (dec.cur != dec.end && !dec.err) 1304 if (dec.cur != dec.end && !dec.err)
1097 dec.err = "garbage after CBOR object"; 1305 dec.err = "garbage after CBOR object";
1098 1306
1099 if (dec.err) 1307 if (dec.err)
1100 { 1308 {
1309 if (dec.shareable)
1310 {
1311 // need to break cyclic links, which would all be in shareable
1312 int i;
1313 SV **svp;
1314
1315 for (i = av_len (dec.shareable) + 1; i--; )
1316 if ((svp = av_fetch (dec.shareable, i, 0)))
1317 sv_setsv (*svp, &PL_sv_undef);
1318 }
1319
1101 SvREFCNT_dec (sv); 1320 SvREFCNT_dec_NN (sv);
1321
1322 if (dec.err_sv)
1323 sv_2mortal (dec.err_sv);
1324
1102 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1325 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1103 } 1326 }
1104 1327
1105 sv = sv_2mortal (sv); 1328 sv = sv_2mortal (sv);
1106 1329
1107 return sv; 1330 return sv;
1108} 1331}
1109 1332
1333/////////////////////////////////////////////////////////////////////////////
1334// incremental parser
1335
1336#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
1337
1338// returns 0 for notyet, 1 for success or error
1339static int
1340incr_parse (CBOR *self, SV *cborstr)
1341{
1342 STRLEN cur;
1343 SvPV (cborstr, cur);
1344
1345 while (ecb_expect_true (self->incr_need <= cur))
1346 {
1347 // table of integer count bytes
1348 static I8 incr_len[MINOR_MASK + 1] = {
1349 0, 0, 0, 0, 0, 0, 0, 0,
1350 0, 0, 0, 0, 0, 0, 0, 0,
1351 0, 0, 0, 0, 0, 0, 0, 0,
1352 1, 2, 4, 8,-1,-1,-1,-2
1353 };
1354
1355 const U8 *p = SvPVX (cborstr) + self->incr_pos;
1356 U8 m = *p & MINOR_MASK;
1357 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1358 I8 ilen = incr_len[m];
1359
1360 self->incr_need = self->incr_pos + 1;
1361
1362 if (ecb_expect_false (ilen < 0))
1363 {
1364 if (m != MINOR_INDEF)
1365 return 1; // error
1366
1367 if (*p == (MAJOR_MISC | MINOR_INDEF))
1368 {
1369 if (count >= 0)
1370 return 1; // error
1371
1372 count = 1;
1373 }
1374 else
1375 {
1376 av_push (self->incr_count, newSViv (-1)); //TODO: nest
1377 count = -1;
1378 }
1379 }
1380 else
1381 {
1382 self->incr_need += ilen;
1383 if (ecb_expect_false (self->incr_need > cur))
1384 return 0;
1385
1386 int major = *p >> MAJOR_SHIFT;
1387
1388 switch (major)
1389 {
1390 case MAJOR_TAG >> MAJOR_SHIFT:
1391 ++count; // tags merely prefix another value
1392 break;
1393
1394 case MAJOR_BYTES >> MAJOR_SHIFT:
1395 case MAJOR_TEXT >> MAJOR_SHIFT:
1396 case MAJOR_ARRAY >> MAJOR_SHIFT:
1397 case MAJOR_MAP >> MAJOR_SHIFT:
1398 {
1399 UV len;
1400
1401 if (ecb_expect_false (ilen))
1402 {
1403 len = 0;
1404
1405 do {
1406 len = (len << 8) | *++p;
1407 } while (--ilen);
1408 }
1409 else
1410 len = m;
1411
1412 switch (major)
1413 {
1414 case MAJOR_BYTES >> MAJOR_SHIFT:
1415 case MAJOR_TEXT >> MAJOR_SHIFT:
1416 self->incr_need += len;
1417 if (ecb_expect_false (self->incr_need > cur))
1418 return 0;
1419
1420 break;
1421
1422 case MAJOR_MAP >> MAJOR_SHIFT:
1423 len <<= 1;
1424 case MAJOR_ARRAY >> MAJOR_SHIFT:
1425 if (len)
1426 {
1427 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1428 count = len + 1;
1429 }
1430 break;
1431 }
1432 }
1433 }
1434 }
1435
1436 self->incr_pos = self->incr_need;
1437
1438 if (count > 0)
1439 {
1440 while (!--count)
1441 {
1442 if (!AvFILLp (self->incr_count))
1443 return 1; // done
1444
1445 SvREFCNT_dec_NN (av_pop (self->incr_count));
1446 count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1447 }
1448
1449 SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
1450 }
1451 }
1452
1453 return 0;
1454}
1455
1456
1110///////////////////////////////////////////////////////////////////////////// 1457/////////////////////////////////////////////////////////////////////////////
1111// XS interface functions 1458// XS interface functions
1112 1459
1113MODULE = CBOR::XS PACKAGE = CBOR::XS 1460MODULE = CBOR::XS PACKAGE = CBOR::XS
1114 1461
… …
1126 1473
1127 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1474 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1128 1475
1129 sv_cbor = newSVpv ("CBOR", 0); 1476 sv_cbor = newSVpv ("CBOR", 0);
1130 SvREADONLY_on (sv_cbor); 1477 SvREADONLY_on (sv_cbor);
1478
1479 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1131} 1480}
1132 1481
1133PROTOTYPES: DISABLE 1482PROTOTYPES: DISABLE
1134 1483
1135void CLONE (...) 1484void CLONE (...)
… …
1154void shrink (CBOR *self, int enable = 1) 1503void shrink (CBOR *self, int enable = 1)
1155 ALIAS: 1504 ALIAS:
1156 shrink = F_SHRINK 1505 shrink = F_SHRINK
1157 allow_unknown = F_ALLOW_UNKNOWN 1506 allow_unknown = F_ALLOW_UNKNOWN
1158 allow_sharing = F_ALLOW_SHARING 1507 allow_sharing = F_ALLOW_SHARING
1508 allow_cycles = F_ALLOW_CYCLES
1509 forbid_objects = F_FORBID_OBJECTS
1159 pack_strings = F_PACK_STRINGS 1510 pack_strings = F_PACK_STRINGS
1511 text_keys = F_TEXT_KEYS
1512 text_strings = F_TEXT_STRINGS
1513 validate_utf8 = F_VALIDATE_UTF8
1160 PPCODE: 1514 PPCODE:
1161{ 1515{
1162 if (enable) 1516 if (enable)
1163 self->flags |= ix; 1517 self->flags |= ix;
1164 else 1518 else
… …
1170void get_shrink (CBOR *self) 1524void get_shrink (CBOR *self)
1171 ALIAS: 1525 ALIAS:
1172 get_shrink = F_SHRINK 1526 get_shrink = F_SHRINK
1173 get_allow_unknown = F_ALLOW_UNKNOWN 1527 get_allow_unknown = F_ALLOW_UNKNOWN
1174 get_allow_sharing = F_ALLOW_SHARING 1528 get_allow_sharing = F_ALLOW_SHARING
1529 get_allow_cycles = F_ALLOW_CYCLES
1530 get_forbid_objects = F_FORBID_OBJECTS
1175 get_pack_strings = F_PACK_STRINGS 1531 get_pack_strings = F_PACK_STRINGS
1532 get_text_keys = F_TEXT_KEYS
1533 get_text_strings = F_TEXT_STRINGS
1534 get_validate_utf8 = F_VALIDATE_UTF8
1176 PPCODE: 1535 PPCODE:
1177 XPUSHs (boolSV (self->flags & ix)); 1536 XPUSHs (boolSV (self->flags & ix));
1178 1537
1179void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1538void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1180 PPCODE: 1539 PPCODE:
… …
1229 EXTEND (SP, 2); 1588 EXTEND (SP, 2);
1230 PUSHs (sv); 1589 PUSHs (sv);
1231 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1590 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1232} 1591}
1233 1592
1593void incr_parse (CBOR *self, SV *cborstr)
1594 ALIAS:
1595 incr_parse_multiple = 1
1596 PPCODE:
1597{
1598 if (SvUTF8 (cborstr))
1599 sv_utf8_downgrade (cborstr, 0);
1600
1601 if (!self->incr_count)
1602 {
1603 self->incr_count = newAV ();
1604 self->incr_pos = 0;
1605 self->incr_need = 1;
1606
1607 av_push (self->incr_count, newSViv (1));
1608 }
1609
1610 do
1611 {
1612 if (!incr_parse (self, cborstr))
1613 {
1614 if (self->incr_need > self->max_size && self->max_size)
1615 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1616 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1617
1618 break;
1619 }
1620
1621 SV *sv;
1622 char *offset;
1623
1624 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1625 XPUSHs (sv);
1626
1627 sv_chop (cborstr, offset);
1628
1629 av_clear (self->incr_count);
1630 av_push (self->incr_count, newSViv (1));
1631
1632 self->incr_pos = 0;
1633 self->incr_need = self->incr_pos + 1;
1634 }
1635 while (ix);
1636}
1637
1638void incr_reset (CBOR *self)
1639 CODE:
1640{
1641 SvREFCNT_dec (self->incr_count);
1642 self->incr_count = 0;
1643}
1644
1234void DESTROY (CBOR *self) 1645void DESTROY (CBOR *self)
1235 PPCODE: 1646 PPCODE:
1236 cbor_free (self); 1647 cbor_free (self);
1237 1648
1238PROTOTYPES: ENABLE 1649PROTOTYPES: ENABLE
1239 1650
1240void encode_cbor (SV *scalar) 1651void encode_cbor (SV *scalar)
1652 ALIAS:
1653 encode_cbor = 0
1654 encode_cbor_sharing = F_ALLOW_SHARING
1241 PPCODE: 1655 PPCODE:
1242{ 1656{
1243 CBOR cbor; 1657 CBOR cbor;
1244 cbor_init (&cbor); 1658 cbor_init (&cbor);
1659 cbor.flags |= ix;
1245 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1660 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1246 XPUSHs (scalar); 1661 XPUSHs (scalar);
1247} 1662}
1248 1663
1249void decode_cbor (SV *cborstr) 1664void decode_cbor (SV *cborstr)

Diff Legend

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