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.34 by root, Sat Nov 30 16:19:59 2013 UTC vs.
Revision 1.44 by root, Tue Feb 18 22:12:12 2014 UTC

… …
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 11
12#define ECB_NO_THREADS 1
12#include "ecb.h" 13#include "ecb.h"
13 14
14// compatibility with perl <5.18 15// compatibility with perl <5.18
15#ifndef HvNAMELEN_get 16#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv)) 17# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
… …
23#endif 24#endif
24#ifndef SvREFCNT_dec_NN 25#ifndef SvREFCNT_dec_NN
25# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv) 26# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
26#endif 27#endif
27 28
29// known major and minor types
30enum cbor_type
31{
32 MAJOR_SHIFT = 5,
33 MINOR_MASK = 0x1f,
34
35 MAJOR_POS_INT = 0 << MAJOR_SHIFT,
36 MAJOR_NEG_INT = 1 << MAJOR_SHIFT,
37 MAJOR_BYTES = 2 << MAJOR_SHIFT,
38 MAJOR_TEXT = 3 << MAJOR_SHIFT,
39 MAJOR_ARRAY = 4 << MAJOR_SHIFT,
40 MAJOR_MAP = 5 << MAJOR_SHIFT,
41 MAJOR_TAG = 6 << MAJOR_SHIFT,
42 MAJOR_MISC = 7 << MAJOR_SHIFT,
43
44 // INT/STRING/ARRAY/MAP subtypes
45 LENGTH_EXT1 = 24,
46 LENGTH_EXT2 = 25,
47 LENGTH_EXT4 = 26,
48 LENGTH_EXT8 = 27,
49
50 // SIMPLE types (effectively MISC subtypes)
51 SIMPLE_FALSE = 20,
52 SIMPLE_TRUE = 21,
53 SIMPLE_NULL = 22,
54 SIMPLE_UNDEF = 23,
55
56 // MISC subtype (unused)
57 MISC_EXT1 = 24,
58 MISC_FLOAT16 = 25,
59 MISC_FLOAT32 = 26,
60 MISC_FLOAT64 = 27,
61
62 // BYTES/TEXT/ARRAY/MAP
63 MINOR_INDEF = 31,
64};
65
28// known tags 66// known tags
29enum cbor_tag 67enum cbor_tag
30{ 68{
31 // extensions 69 // extensions
32 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref 70 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
33 CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object 71 CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
34 CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object 72 CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
35 CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing 73 CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
36 CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing 74 CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
37 CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref 75 CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
38 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection 76 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
39 77
40 // rfc7049 78 // rfc7049
41 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8 79 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
42 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any 80 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
43 CBOR_TAG_POS_BIGNUM = 2, // byte string 81 CBOR_TAG_POS_BIGNUM = 2, // byte string
44 CBOR_TAG_NEG_BIGNUM = 3, // byte string 82 CBOR_TAG_NEG_BIGNUM = 3, // byte string
45 CBOR_TAG_DECIMAL = 4, // decimal fraction, array 83 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
46 CBOR_TAG_BIGFLOAT = 5, // array 84 CBOR_TAG_BIGFLOAT = 5, // array
47 85
48 CBOR_TAG_CONV_B64U = 21, // base64url, any 86 CBOR_TAG_CONV_B64U = 21, // base64url, any
49 CBOR_TAG_CONV_B64 = 22, // base64, any 87 CBOR_TAG_CONV_B64 = 22, // base64, any
50 CBOR_TAG_CONV_HEX = 23, // base16, any 88 CBOR_TAG_CONV_HEX = 23, // base16, any
51 CBOR_TAG_CBOR = 24, // embedded cbor, byte string 89 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
52 90
53 CBOR_TAG_URI = 32, // URI rfc3986, utf-8 91 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
54 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8 92 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
55 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8 93 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
56 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8 94 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
57 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 95 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
58 96
59 CBOR_TAG_MAGIC = 55799 // self-describe cbor 97 CBOR_TAG_MAGIC = 55799, // self-describe cbor
60}; 98};
61 99
62#define F_SHRINK 0x00000001UL 100#define F_SHRINK 0x00000001UL
63#define F_ALLOW_UNKNOWN 0x00000002UL 101#define F_ALLOW_UNKNOWN 0x00000002UL
64#define F_ALLOW_SHARING 0x00000004UL 102#define F_ALLOW_SHARING 0x00000004UL
103#define F_ALLOW_CYCLES 0x00000008UL
65#define F_PACK_STRINGS 0x00000008UL 104#define F_PACK_STRINGS 0x00000010UL
105#define F_VALIDATE_UTF8 0x00000020UL
66 106
67#define INIT_SIZE 32 // initial scalar size to be allocated 107#define INIT_SIZE 32 // initial scalar size to be allocated
68 108
69#define SB do { 109#define SB do {
70#define SE } while (0) 110#define SE } while (0)
… …
89typedef struct { 129typedef struct {
90 U32 flags; 130 U32 flags;
91 U32 max_depth; 131 U32 max_depth;
92 STRLEN max_size; 132 STRLEN max_size;
93 SV *filter; 133 SV *filter;
134
135 // for the incremental parser
136 STRLEN incr_pos; // the current offset into the text
137 STRLEN incr_need; // minimum bytes needed to decode
138 AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
94} CBOR; 139} CBOR;
95 140
96ecb_inline void 141ecb_inline void
97cbor_init (CBOR *cbor) 142cbor_init (CBOR *cbor)
98{ 143{
… …
102 147
103ecb_inline void 148ecb_inline void
104cbor_free (CBOR *cbor) 149cbor_free (CBOR *cbor)
105{ 150{
106 SvREFCNT_dec (cbor->filter); 151 SvREFCNT_dec (cbor->filter);
152 SvREFCNT_dec (cbor->incr_count);
107} 153}
108 154
109///////////////////////////////////////////////////////////////////////////// 155/////////////////////////////////////////////////////////////////////////////
110// utility functions 156// utility functions
111 157
… …
189static void 235static void
190encode_uint (enc_t *enc, int major, UV len) 236encode_uint (enc_t *enc, int major, UV len)
191{ 237{
192 need (enc, 9); 238 need (enc, 9);
193 239
194 if (ecb_expect_true (len < 24)) 240 if (ecb_expect_true (len < LENGTH_EXT1))
195 *enc->cur++ = major | len; 241 *enc->cur++ = major | len;
196 else if (ecb_expect_true (len <= 0xff)) 242 else if (ecb_expect_true (len <= 0xffU))
197 { 243 {
198 *enc->cur++ = major | 24; 244 *enc->cur++ = major | LENGTH_EXT1;
199 *enc->cur++ = len; 245 *enc->cur++ = len;
200 } 246 }
201 else if (len <= 0xffff) 247 else if (len <= 0xffffU)
202 { 248 {
203 *enc->cur++ = major | 25; 249 *enc->cur++ = major | LENGTH_EXT2;
204 *enc->cur++ = len >> 8; 250 *enc->cur++ = len >> 8;
205 *enc->cur++ = len; 251 *enc->cur++ = len;
206 } 252 }
207 else if (len <= 0xffffffff) 253 else if (len <= 0xffffffffU)
208 { 254 {
209 *enc->cur++ = major | 26; 255 *enc->cur++ = major | LENGTH_EXT4;
210 *enc->cur++ = len >> 24; 256 *enc->cur++ = len >> 24;
211 *enc->cur++ = len >> 16; 257 *enc->cur++ = len >> 16;
212 *enc->cur++ = len >> 8; 258 *enc->cur++ = len >> 8;
213 *enc->cur++ = len; 259 *enc->cur++ = len;
214 } 260 }
215 else 261 else
216 { 262 {
217 *enc->cur++ = major | 27; 263 *enc->cur++ = major | LENGTH_EXT8;
218 *enc->cur++ = len >> 56; 264 *enc->cur++ = len >> 56;
219 *enc->cur++ = len >> 48; 265 *enc->cur++ = len >> 48;
220 *enc->cur++ = len >> 40; 266 *enc->cur++ = len >> 40;
221 *enc->cur++ = len >> 32; 267 *enc->cur++ = len >> 32;
222 *enc->cur++ = len >> 24; 268 *enc->cur++ = len >> 24;
… …
227} 273}
228 274
229ecb_inline void 275ecb_inline void
230encode_tag (enc_t *enc, UV tag) 276encode_tag (enc_t *enc, UV tag)
231{ 277{
232 encode_uint (enc, 0xc0, tag); 278 encode_uint (enc, MAJOR_TAG, tag);
233} 279}
234 280
235ecb_inline void 281ecb_inline void
236encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 282encode_str (enc_t *enc, int utf8, char *str, STRLEN len)
237{ 283{
238 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 284 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
239 need (enc, len); 285 need (enc, len);
240 memcpy (enc->cur, str, len); 286 memcpy (enc->cur, str, len);
241 enc->cur += len; 287 enc->cur += len;
242} 288}
243 289
… …
250 296
251 if (SvOK (*svp)) 297 if (SvOK (*svp))
252 { 298 {
253 // already registered, use stringref 299 // already registered, use stringref
254 encode_tag (enc, CBOR_TAG_STRINGREF); 300 encode_tag (enc, CBOR_TAG_STRINGREF);
255 encode_uint (enc, 0x00, SvUV (*svp)); 301 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
256 return; 302 return;
257 } 303 }
258 else if (len >= minimum_string_length (enc->stringref_idx)) 304 else if (len >= minimum_string_length (enc->stringref_idx))
259 { 305 {
260 // register only 306 // register only
… …
276 if (enc->depth >= enc->cbor.max_depth) 322 if (enc->depth >= enc->cbor.max_depth)
277 croak (ERR_NESTING_EXCEEDED); 323 croak (ERR_NESTING_EXCEEDED);
278 324
279 ++enc->depth; 325 ++enc->depth;
280 326
281 encode_uint (enc, 0x80, len + 1); 327 encode_uint (enc, MAJOR_ARRAY, len + 1);
282 328
283 for (i = 0; i <= len; ++i) 329 for (i = 0; i <= len; ++i)
284 { 330 {
285 SV **svp = av_fetch (av, i, 0); 331 SV **svp = av_fetch (av, i, 0);
286 encode_sv (enc, svp ? *svp : &PL_sv_undef); 332 encode_sv (enc, svp ? *svp : &PL_sv_undef);
… …
301 347
302 int pairs = hv_iterinit (hv); 348 int pairs = hv_iterinit (hv);
303 int mg = SvMAGICAL (hv); 349 int mg = SvMAGICAL (hv);
304 350
305 if (mg) 351 if (mg)
306 encode_ch (enc, 0xa0 | 31); 352 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
307 else 353 else
308 encode_uint (enc, 0xa0, pairs); 354 encode_uint (enc, MAJOR_MAP, pairs);
309 355
310 while ((he = hv_iternext (hv))) 356 while ((he = hv_iternext (hv)))
311 { 357 {
312 if (HeKLEN (he) == HEf_SVKEY) 358 if (HeKLEN (he) == HEf_SVKEY)
313 encode_sv (enc, HeSVKEY (he)); 359 encode_sv (enc, HeSVKEY (he));
… …
316 362
317 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 363 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
318 } 364 }
319 365
320 if (mg) 366 if (mg)
321 encode_ch (enc, 0xe0 | 31); 367 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
322 368
323 --enc->depth; 369 --enc->depth;
324} 370}
325 371
326// encode objects, arrays and special \0=false and \1=true values. 372// encode objects, arrays and special \0=false and \1=true values.
… …
345 391
346 HV *stash = SvSTASH (sv); 392 HV *stash = SvSTASH (sv);
347 393
348 if (stash == boolean_stash) 394 if (stash == boolean_stash)
349 { 395 {
350 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 396 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
351 return; 397 return;
352 } 398 }
353 else if (stash == error_stash) 399 else if (stash == error_stash)
354 { 400 {
355 encode_ch (enc, 0xe0 | 23); 401 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
356 return; 402 return;
357 } 403 }
358 else if (stash == tagged_stash) 404 else if (stash == tagged_stash)
359 { 405 {
360 if (svt != SVt_PVAV) 406 if (svt != SVt_PVAV)
361 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 407 croak ("encountered CBOR::XS::Tagged object that isn't an array");
362 408
363 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 409 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
364 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 410 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
365 411
366 return; 412 return;
367 } 413 }
368 } 414 }
… …
376 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 422 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
377 423
378 if (SvOK (*svp)) 424 if (SvOK (*svp))
379 { 425 {
380 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF); 426 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
381 encode_uint (enc, 0x00, SvUV (*svp)); 427 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
382 return; 428 return;
383 } 429 }
384 else 430 else
385 { 431 {
386 sv_setuv (*svp, enc->shareable_idx); 432 sv_setuv (*svp, enc->shareable_idx);
… …
434 // catch this surprisingly common error 480 // catch this surprisingly common error
435 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 481 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
436 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 482 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
437 483
438 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 484 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
439 encode_uint (enc, 0x80, count + 1); 485 encode_uint (enc, MAJOR_ARRAY, count + 1);
440 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 486 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
441 487
442 while (count) 488 while (count)
443 encode_sv (enc, SP[1 - count--]); 489 encode_sv (enc, SP[1 - count--]);
444 490
… …
466{ 512{
467 double nv = SvNVX (sv); 513 double nv = SvNVX (sv);
468 514
469 need (enc, 9); 515 need (enc, 9);
470 516
471 if (ecb_expect_false (nv == (U32)nv)) 517 if (ecb_expect_false (nv == (NV)(U32)nv))
472 encode_uint (enc, 0x00, (U32)nv); 518 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
473 //TODO: maybe I32? 519 //TODO: maybe I32?
474 else if (ecb_expect_false (nv == (float)nv)) 520 else if (ecb_expect_false (nv == (float)nv))
475 { 521 {
476 uint32_t fp = ecb_float_to_binary32 (nv); 522 uint32_t fp = ecb_float_to_binary32 (nv);
477 523
478 *enc->cur++ = 0xe0 | 26; 524 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
479 525
480 if (!ecb_big_endian ()) 526 if (!ecb_big_endian ())
481 fp = ecb_bswap32 (fp); 527 fp = ecb_bswap32 (fp);
482 528
483 memcpy (enc->cur, &fp, 4); 529 memcpy (enc->cur, &fp, 4);
… …
485 } 531 }
486 else 532 else
487 { 533 {
488 uint64_t fp = ecb_double_to_binary64 (nv); 534 uint64_t fp = ecb_double_to_binary64 (nv);
489 535
490 *enc->cur++ = 0xe0 | 27; 536 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
491 537
492 if (!ecb_big_endian ()) 538 if (!ecb_big_endian ())
493 fp = ecb_bswap64 (fp); 539 fp = ecb_bswap64 (fp);
494 540
495 memcpy (enc->cur, &fp, 8); 541 memcpy (enc->cur, &fp, 8);
… …
511 else if (SvNOKp (sv)) 557 else if (SvNOKp (sv))
512 encode_nv (enc, sv); 558 encode_nv (enc, sv);
513 else if (SvIOKp (sv)) 559 else if (SvIOKp (sv))
514 { 560 {
515 if (SvIsUV (sv)) 561 if (SvIsUV (sv))
516 encode_uint (enc, 0x00, SvUVX (sv)); 562 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
517 else if (SvIVX (sv) >= 0) 563 else if (SvIVX (sv) >= 0)
518 encode_uint (enc, 0x00, SvIVX (sv)); 564 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
519 else 565 else
520 encode_uint (enc, 0x20, -(SvIVX (sv) + 1)); 566 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
521 } 567 }
522 else if (SvROK (sv)) 568 else if (SvROK (sv))
523 encode_rv (enc, SvRV (sv)); 569 encode_rv (enc, SvRV (sv));
524 else if (!SvOK (sv)) 570 else if (!SvOK (sv))
525 encode_ch (enc, 0xe0 | 22); 571 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
526 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 572 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
527 encode_ch (enc, 0xe0 | 23); 573 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
528 else 574 else
529 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data", 575 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
530 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 576 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
531} 577}
532 578
… …
585#define DEC_DEC_DEPTH --dec->depth 631#define DEC_DEC_DEPTH --dec->depth
586 632
587static UV 633static UV
588decode_uint (dec_t *dec) 634decode_uint (dec_t *dec)
589{ 635{
590 switch (*dec->cur & 31) 636 U8 m = *dec->cur & MINOR_MASK;
591 { 637 ++dec->cur;
592 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
593 case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
594 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
595 return *dec->cur++ & 31;
596 638
597 case 24: 639 if (ecb_expect_true (m < LENGTH_EXT1))
640 return m;
641 else if (ecb_expect_true (m == LENGTH_EXT1))
642 {
598 WANT (2); 643 WANT (1);
599 dec->cur += 2; 644 dec->cur += 1;
600 return dec->cur[-1]; 645 return dec->cur[-1];
601 646 }
602 case 25: 647 else if (ecb_expect_true (m == LENGTH_EXT2))
648 {
603 WANT (3); 649 WANT (2);
604 dec->cur += 3; 650 dec->cur += 2;
605 return (((UV)dec->cur[-2]) << 8) 651 return (((UV)dec->cur[-2]) << 8)
606 | ((UV)dec->cur[-1]); 652 | ((UV)dec->cur[-1]);
607 653 }
608 case 26: 654 else if (ecb_expect_true (m == LENGTH_EXT4))
655 {
609 WANT (5); 656 WANT (4);
610 dec->cur += 5; 657 dec->cur += 4;
611 return (((UV)dec->cur[-4]) << 24) 658 return (((UV)dec->cur[-4]) << 24)
612 | (((UV)dec->cur[-3]) << 16) 659 | (((UV)dec->cur[-3]) << 16)
613 | (((UV)dec->cur[-2]) << 8) 660 | (((UV)dec->cur[-2]) << 8)
614 | ((UV)dec->cur[-1]); 661 | ((UV)dec->cur[-1]);
615 662 }
616 case 27: 663 else if (ecb_expect_true (m == LENGTH_EXT8))
664 {
617 WANT (9); 665 WANT (8);
618 dec->cur += 9; 666 dec->cur += 8;
619 667
620 return 668 return
621#if UVSIZE < 8 669#if UVSIZE < 8
622 0 670 0
623#else 671#else
624 (((UV)dec->cur[-8]) << 56) 672 (((UV)dec->cur[-8]) << 56)
625 | (((UV)dec->cur[-7]) << 48) 673 | (((UV)dec->cur[-7]) << 48)
626 | (((UV)dec->cur[-6]) << 40) 674 | (((UV)dec->cur[-6]) << 40)
627 | (((UV)dec->cur[-5]) << 32) 675 | (((UV)dec->cur[-5]) << 32)
628#endif 676#endif
629 | (((UV)dec->cur[-4]) << 24) 677 | (((UV)dec->cur[-4]) << 24)
630 | (((UV)dec->cur[-3]) << 16) 678 | (((UV)dec->cur[-3]) << 16)
631 | (((UV)dec->cur[-2]) << 8) 679 | (((UV)dec->cur[-2]) << 8)
632 | ((UV)dec->cur[-1]); 680 | ((UV)dec->cur[-1]);
633 681 }
634 default: 682 else
635 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 683 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
636 }
637 684
638fail: 685fail:
639 return 0; 686 return 0;
640} 687}
641 688
… …
646{ 693{
647 AV *av = newAV (); 694 AV *av = newAV ();
648 695
649 DEC_INC_DEPTH; 696 DEC_INC_DEPTH;
650 697
651 if ((*dec->cur & 31) == 31) 698 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
652 { 699 {
653 ++dec->cur; 700 ++dec->cur;
654 701
655 for (;;) 702 for (;;)
656 { 703 {
657 WANT (1); 704 WANT (1);
658 705
659 if (*dec->cur == (0xe0 | 31)) 706 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
660 { 707 {
661 ++dec->cur; 708 ++dec->cur;
662 break; 709 break;
663 } 710 }
664 711
… …
667 } 714 }
668 else 715 else
669 { 716 {
670 int i, len = decode_uint (dec); 717 int i, len = decode_uint (dec);
671 718
719 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
672 av_fill (av, len - 1); 720 av_fill (av, len - 1);
673 721
674 for (i = 0; i < len; ++i) 722 for (i = 0; i < len; ++i)
675 AvARRAY (av)[i] = decode_sv (dec); 723 AvARRAY (av)[i] = decode_sv (dec);
676 } 724 }
… …
689{ 737{
690 // for speed reasons, we specialcase single-string 738 // for speed reasons, we specialcase single-string
691 // byte or utf-8 strings as keys, but only when !stringref 739 // byte or utf-8 strings as keys, but only when !stringref
692 740
693 if (ecb_expect_true (!dec->stringref)) 741 if (ecb_expect_true (!dec->stringref))
694 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27) 742 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
695 { 743 {
696 I32 len = decode_uint (dec); 744 I32 len = decode_uint (dec);
697 char *key = (char *)dec->cur; 745 char *key = (char *)dec->cur;
698 746
699 dec->cur += len; 747 dec->cur += len;
700 748
701 if (ecb_expect_false (dec->stringref))
702 av_push (dec->stringref, newSVpvn (key, len));
703
704 hv_store (hv, key, len, decode_sv (dec), 0); 749 hv_store (hv, key, len, decode_sv (dec), 0);
705 750
706 return; 751 return;
707 } 752 }
708 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27) 753 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
709 { 754 {
710 I32 len = decode_uint (dec); 755 I32 len = decode_uint (dec);
711 char *key = (char *)dec->cur; 756 char *key = (char *)dec->cur;
712 757
713 dec->cur += len; 758 dec->cur += len;
714 759
715 if (ecb_expect_false (dec->stringref)) 760 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
716 av_push (dec->stringref, newSVpvn_utf8 (key, len, 1)); 761 if (!is_utf8_string (key, len))
762 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
717 763
718 hv_store (hv, key, -len, decode_sv (dec), 0); 764 hv_store (hv, key, -len, decode_sv (dec), 0);
719 765
720 return; 766 return;
721 } 767 }
… …
723 SV *k = decode_sv (dec); 769 SV *k = decode_sv (dec);
724 SV *v = decode_sv (dec); 770 SV *v = decode_sv (dec);
725 771
726 hv_store_ent (hv, k, v, 0); 772 hv_store_ent (hv, k, v, 0);
727 SvREFCNT_dec (k); 773 SvREFCNT_dec (k);
774
775fail:
776 ;
728} 777}
729 778
730static SV * 779static SV *
731decode_hv (dec_t *dec) 780decode_hv (dec_t *dec)
732{ 781{
733 HV *hv = newHV (); 782 HV *hv = newHV ();
734 783
735 DEC_INC_DEPTH; 784 DEC_INC_DEPTH;
736 785
737 if ((*dec->cur & 31) == 31) 786 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
738 { 787 {
739 ++dec->cur; 788 ++dec->cur;
740 789
741 for (;;) 790 for (;;)
742 { 791 {
743 WANT (1); 792 WANT (1);
744 793
745 if (*dec->cur == (0xe0 | 31)) 794 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
746 { 795 {
747 ++dec->cur; 796 ++dec->cur;
748 break; 797 break;
749 } 798 }
750 799
… …
771static SV * 820static SV *
772decode_str (dec_t *dec, int utf8) 821decode_str (dec_t *dec, int utf8)
773{ 822{
774 SV *sv = 0; 823 SV *sv = 0;
775 824
776 if ((*dec->cur & 31) == 31) 825 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
777 { 826 {
778 // indefinite length strings 827 // indefinite length strings
779 ++dec->cur; 828 ++dec->cur;
780 829
781 unsigned char major = *dec->cur & 0xe0; 830 U8 major = *dec->cur & MAJOR_MISC;
782 831
783 sv = newSVpvn ("", 0); 832 sv = newSVpvn ("", 0);
784 833
785 for (;;) 834 for (;;)
786 { 835 {
787 WANT (1); 836 WANT (1);
788 837
789 if ((*dec->cur ^ major) >= 31) 838 if ((*dec->cur - major) > LENGTH_EXT8)
790 if (*dec->cur == (0xe0 | 31)) 839 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
791 { 840 {
792 ++dec->cur; 841 ++dec->cur;
793 break; 842 break;
794 } 843 }
795 else 844 else
… …
814 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1)) 863 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
815 av_push (dec->stringref, SvREFCNT_inc_NN (sv)); 864 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
816 } 865 }
817 866
818 if (utf8) 867 if (utf8)
868 {
869 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
870 if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
871 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
872
819 SvUTF8_on (sv); 873 SvUTF8_on (sv);
874 }
820 875
821 return sv; 876 return sv;
822 877
823fail: 878fail:
824 SvREFCNT_dec (sv); 879 SvREFCNT_dec (sv);
… …
856 } 911 }
857 break; 912 break;
858 913
859 case CBOR_TAG_STRINGREF: 914 case CBOR_TAG_STRINGREF:
860 { 915 {
861 if ((*dec->cur >> 5) != 0) 916 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
862 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 917 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
863 918
864 UV idx = decode_uint (dec); 919 UV idx = decode_uint (dec);
865 920
866 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 921 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))
… …
873 case CBOR_TAG_VALUE_SHAREABLE: 928 case CBOR_TAG_VALUE_SHAREABLE:
874 { 929 {
875 if (ecb_expect_false (!dec->shareable)) 930 if (ecb_expect_false (!dec->shareable))
876 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ()); 931 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
877 932
933 if (dec->cbor.flags & F_ALLOW_CYCLES)
934 {
878 sv = newSV (0); 935 sv = newSV (0);
879 av_push (dec->shareable, SvREFCNT_inc_NN (sv)); 936 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
880 937
881 SV *osv = decode_sv (dec); 938 SV *osv = decode_sv (dec);
882 sv_setsv (sv, osv); 939 sv_setsv (sv, osv);
883 SvREFCNT_dec_NN (osv); 940 SvREFCNT_dec_NN (osv);
941 }
942 else
943 {
944 av_push (dec->shareable, &PL_sv_undef);
945 int idx = AvFILLp (dec->shareable);
946 sv = decode_sv (dec);
947 av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
948 }
884 } 949 }
885 break; 950 break;
886 951
887 case CBOR_TAG_VALUE_SHAREDREF: 952 case CBOR_TAG_VALUE_SHAREDREF:
888 { 953 {
889 if ((*dec->cur >> 5) != 0) 954 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
890 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 955 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
891 956
892 UV idx = decode_uint (dec); 957 UV idx = decode_uint (dec);
893 958
894 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 959 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))
895 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 960 ERR ("corrupted CBOR data (sharedref index out of bounds)");
896 961
897 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 962 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
963
964 if (sv == &PL_sv_undef)
965 ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
898 } 966 }
899 break; 967 break;
900 968
901 case CBOR_TAG_PERL_OBJECT: 969 case CBOR_TAG_PERL_OBJECT:
902 { 970 {
… …
1003static SV * 1071static SV *
1004decode_sv (dec_t *dec) 1072decode_sv (dec_t *dec)
1005{ 1073{
1006 WANT (1); 1074 WANT (1);
1007 1075
1008 switch (*dec->cur >> 5) 1076 switch (*dec->cur >> MAJOR_SHIFT)
1009 { 1077 {
1010 case 0: // unsigned int 1078 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
1011 return newSVuv (decode_uint (dec)); 1079 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
1012 case 1: // negative int 1080 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
1013 return newSViv (-1 - (IV)decode_uint (dec)); 1081 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
1014 case 2: // octet string 1082 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
1015 return decode_str (dec, 0); 1083 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
1016 case 3: // utf-8 string 1084 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
1017 return decode_str (dec, 1); 1085
1018 case 4: // array 1086 case MAJOR_MISC >> MAJOR_SHIFT:
1019 return decode_av (dec);
1020 case 5: // map
1021 return decode_hv (dec);
1022 case 6: // tag
1023 return decode_tagged (dec);
1024 case 7: // misc
1025 switch (*dec->cur++ & 31) 1087 switch (*dec->cur++ & MINOR_MASK)
1026 { 1088 {
1027 case 20: 1089 case SIMPLE_FALSE:
1028#if CBOR_SLOW 1090#if CBOR_SLOW
1029 types_false = get_bool ("Types::Serialiser::false"); 1091 types_false = get_bool ("Types::Serialiser::false");
1030#endif 1092#endif
1031 return newSVsv (types_false); 1093 return newSVsv (types_false);
1032 case 21: 1094 case SIMPLE_TRUE:
1033#if CBOR_SLOW 1095#if CBOR_SLOW
1034 types_true = get_bool ("Types::Serialiser::true"); 1096 types_true = get_bool ("Types::Serialiser::true");
1035#endif 1097#endif
1036 return newSVsv (types_true); 1098 return newSVsv (types_true);
1037 case 22: 1099 case SIMPLE_NULL:
1038 return newSVsv (&PL_sv_undef); 1100 return newSVsv (&PL_sv_undef);
1039 case 23: 1101 case SIMPLE_UNDEF:
1040#if CBOR_SLOW 1102#if CBOR_SLOW
1041 types_error = get_bool ("Types::Serialiser::error"); 1103 types_error = get_bool ("Types::Serialiser::error");
1042#endif 1104#endif
1043 return newSVsv (types_error); 1105 return newSVsv (types_error);
1044 1106
1045 case 25: 1107 case MISC_FLOAT16:
1046 { 1108 {
1047 WANT (2); 1109 WANT (2);
1048 1110
1049 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1111 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
1050 dec->cur += 2; 1112 dec->cur += 2;
1051 1113
1052 return newSVnv (ecb_binary16_to_float (fp)); 1114 return newSVnv (ecb_binary16_to_float (fp));
1053 } 1115 }
1054 1116
1055 case 26: 1117 case MISC_FLOAT32:
1056 { 1118 {
1057 uint32_t fp; 1119 uint32_t fp;
1058 WANT (4); 1120 WANT (4);
1059 memcpy (&fp, dec->cur, 4); 1121 memcpy (&fp, dec->cur, 4);
1060 dec->cur += 4; 1122 dec->cur += 4;
… …
1063 fp = ecb_bswap32 (fp); 1125 fp = ecb_bswap32 (fp);
1064 1126
1065 return newSVnv (ecb_binary32_to_float (fp)); 1127 return newSVnv (ecb_binary32_to_float (fp));
1066 } 1128 }
1067 1129
1068 case 27: 1130 case MISC_FLOAT64:
1069 { 1131 {
1070 uint64_t fp; 1132 uint64_t fp;
1071 WANT (8); 1133 WANT (8);
1072 memcpy (&fp, dec->cur, 8); 1134 memcpy (&fp, dec->cur, 8);
1073 dec->cur += 8; 1135 dec->cur += 8;
… …
1076 fp = ecb_bswap64 (fp); 1138 fp = ecb_bswap64 (fp);
1077 1139
1078 return newSVnv (ecb_binary64_to_double (fp)); 1140 return newSVnv (ecb_binary64_to_double (fp));
1079 } 1141 }
1080 1142
1081 // 0..19 unassigned 1143 // 0..19 unassigned simple
1082 // 24 reserved + unassigned (reserved values are not encodable) 1144 // 24 reserved + unassigned simple (reserved values are not encodable)
1145 // 28-30 unassigned misc
1146 // 31 break code
1083 default: 1147 default:
1084 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1148 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1085 } 1149 }
1086 1150
1087 break; 1151 break;
1088 } 1152 }
1089 1153
… …
1116 if (dec.cur != dec.end && !dec.err) 1180 if (dec.cur != dec.end && !dec.err)
1117 dec.err = "garbage after CBOR object"; 1181 dec.err = "garbage after CBOR object";
1118 1182
1119 if (dec.err) 1183 if (dec.err)
1120 { 1184 {
1185 if (dec.shareable)
1186 {
1187 // need to break cyclic links, which whould all be in shareable
1188 int i;
1189 SV **svp;
1190
1191 for (i = av_len (dec.shareable) + 1; i--; )
1192 if ((svp = av_fetch (dec.shareable, i, 0)))
1193 sv_setsv (*svp, &PL_sv_undef);
1194 }
1195
1121 SvREFCNT_dec (sv); 1196 SvREFCNT_dec (sv);
1122 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1197 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1123 } 1198 }
1124 1199
1125 sv = sv_2mortal (sv); 1200 sv = sv_2mortal (sv);
1126 1201
1127 return sv; 1202 return sv;
1128} 1203}
1129 1204
1205/////////////////////////////////////////////////////////////////////////////
1206// incremental parser
1207
1208#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
1209
1210// returns 0 for notyet, 1 for success or error
1211static int
1212incr_parse (CBOR *self, SV *cborstr)
1213{
1214 STRLEN cur;
1215 SvPV (cborstr, cur);
1216
1217 while (ecb_expect_true (self->incr_need <= cur))
1218 {
1219 // table of integer count bytes
1220 static I8 incr_len[MINOR_MASK + 1] = {
1221 0, 0, 0, 0, 0, 0, 0, 0,
1222 0, 0, 0, 0, 0, 0, 0, 0,
1223 0, 0, 0, 0, 0, 0, 0, 0,
1224 1, 2, 4, 8,-1,-1,-1,-2
1225 };
1226
1227 const U8 *p = SvPVX (cborstr) + self->incr_pos;
1228 U8 m = *p & MINOR_MASK;
1229 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1230 I8 ilen = incr_len[m];
1231
1232 self->incr_need = self->incr_pos + 1;
1233
1234 if (ecb_expect_false (ilen < 0))
1235 {
1236 if (m != MINOR_INDEF)
1237 return 1; // error
1238
1239 if (*p == (MAJOR_MISC | MINOR_INDEF))
1240 {
1241 if (count >= 0)
1242 return 1; // error
1243
1244 count = 1;
1245 }
1246 else
1247 {
1248 av_push (self->incr_count, newSViv (-1)); //TODO: nest
1249 count = -1;
1250 }
1251 }
1252 else
1253 {
1254 self->incr_need += ilen;
1255 if (ecb_expect_false (self->incr_need > cur))
1256 return 0;
1257
1258 int major = *p >> MAJOR_SHIFT;
1259
1260 switch (major)
1261 {
1262 case MAJOR_BYTES >> MAJOR_SHIFT:
1263 case MAJOR_TEXT >> MAJOR_SHIFT:
1264 case MAJOR_ARRAY >> MAJOR_SHIFT:
1265 case MAJOR_MAP >> MAJOR_SHIFT:
1266 {
1267 UV len;
1268
1269 if (ecb_expect_false (ilen))
1270 {
1271 len = 0;
1272
1273 do {
1274 len = (len << 8) | *++p;
1275 } while (--ilen);
1276 }
1277 else
1278 len = m;
1279
1280 switch (major)
1281 {
1282 case MAJOR_BYTES >> MAJOR_SHIFT:
1283 case MAJOR_TEXT >> MAJOR_SHIFT:
1284 self->incr_need += len;
1285 if (ecb_expect_false (self->incr_need > cur))
1286 return 0;
1287
1288 break;
1289
1290 case MAJOR_MAP >> MAJOR_SHIFT:
1291 len <<= 1;
1292 case MAJOR_ARRAY >> MAJOR_SHIFT:
1293 if (len)
1294 {
1295 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1296 count = len + 1;
1297 }
1298 break;
1299 }
1300 }
1301 }
1302 }
1303
1304 self->incr_pos = self->incr_need;
1305
1306 if (count > 0)
1307 {
1308 while (!--count)
1309 {
1310 if (!AvFILLp (self->incr_count))
1311 return 1; // done
1312
1313 SvREFCNT_dec_NN (av_pop (self->incr_count));
1314 count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1315 }
1316
1317 SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
1318 }
1319 }
1320
1321 return 0;
1322}
1323
1324
1130///////////////////////////////////////////////////////////////////////////// 1325/////////////////////////////////////////////////////////////////////////////
1131// XS interface functions 1326// XS interface functions
1132 1327
1133MODULE = CBOR::XS PACKAGE = CBOR::XS 1328MODULE = CBOR::XS PACKAGE = CBOR::XS
1134 1329
… …
1174void shrink (CBOR *self, int enable = 1) 1369void shrink (CBOR *self, int enable = 1)
1175 ALIAS: 1370 ALIAS:
1176 shrink = F_SHRINK 1371 shrink = F_SHRINK
1177 allow_unknown = F_ALLOW_UNKNOWN 1372 allow_unknown = F_ALLOW_UNKNOWN
1178 allow_sharing = F_ALLOW_SHARING 1373 allow_sharing = F_ALLOW_SHARING
1374 allow_cycles = F_ALLOW_CYCLES
1179 pack_strings = F_PACK_STRINGS 1375 pack_strings = F_PACK_STRINGS
1376 validate_utf8 = F_VALIDATE_UTF8
1180 PPCODE: 1377 PPCODE:
1181{ 1378{
1182 if (enable) 1379 if (enable)
1183 self->flags |= ix; 1380 self->flags |= ix;
1184 else 1381 else
… …
1190void get_shrink (CBOR *self) 1387void get_shrink (CBOR *self)
1191 ALIAS: 1388 ALIAS:
1192 get_shrink = F_SHRINK 1389 get_shrink = F_SHRINK
1193 get_allow_unknown = F_ALLOW_UNKNOWN 1390 get_allow_unknown = F_ALLOW_UNKNOWN
1194 get_allow_sharing = F_ALLOW_SHARING 1391 get_allow_sharing = F_ALLOW_SHARING
1392 get_allow_cycles = F_ALLOW_CYCLES
1195 get_pack_strings = F_PACK_STRINGS 1393 get_pack_strings = F_PACK_STRINGS
1394 get_validate_utf8 = F_VALIDATE_UTF8
1196 PPCODE: 1395 PPCODE:
1197 XPUSHs (boolSV (self->flags & ix)); 1396 XPUSHs (boolSV (self->flags & ix));
1198 1397
1199void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1398void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1200 PPCODE: 1399 PPCODE:
… …
1249 EXTEND (SP, 2); 1448 EXTEND (SP, 2);
1250 PUSHs (sv); 1449 PUSHs (sv);
1251 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1450 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1252} 1451}
1253 1452
1453void incr_parse (CBOR *self, SV *cborstr)
1454 ALIAS:
1455 incr_parse_multiple = 1
1456 PPCODE:
1457{
1458 if (SvUTF8 (cborstr))
1459 sv_utf8_downgrade (cborstr, 0);
1460
1461 if (!self->incr_count)
1462 {
1463 self->incr_count = newAV ();
1464 self->incr_pos = 0;
1465 self->incr_need = 1;
1466
1467 av_push (self->incr_count, newSViv (1));
1468 }
1469
1470 do
1471 {
1472 if (!incr_parse (self, cborstr))
1473 {
1474 if (self->incr_need > self->max_size && self->max_size)
1475 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1476 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1477
1478 break;
1479 }
1480
1481 SV *sv;
1482 char *offset;
1483
1484 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1485 XPUSHs (sv);
1486
1487 sv_chop (cborstr, offset);
1488
1489 av_clear (self->incr_count);
1490 av_push (self->incr_count, newSViv (1));
1491
1492 self->incr_pos = 0;
1493 self->incr_need = self->incr_pos + 1;
1494 }
1495 while (ix);
1496}
1497
1498void incr_reset (CBOR *self)
1499 CODE:
1500{
1501 SvREFCNT_dec (self->incr_count);
1502 self->incr_count = 0;
1503}
1504
1254void DESTROY (CBOR *self) 1505void DESTROY (CBOR *self)
1255 PPCODE: 1506 PPCODE:
1256 cbor_free (self); 1507 cbor_free (self);
1257 1508
1258PROTOTYPES: ENABLE 1509PROTOTYPES: ENABLE
1259 1510
1260void encode_cbor (SV *scalar) 1511void encode_cbor (SV *scalar)
1512 ALIAS:
1513 encode_cbor = 0
1514 encode_cbor_sharing = F_ALLOW_SHARING
1261 PPCODE: 1515 PPCODE:
1262{ 1516{
1263 CBOR cbor; 1517 CBOR cbor;
1264 cbor_init (&cbor); 1518 cbor_init (&cbor);
1519 cbor.flags |= ix;
1265 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1520 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1266 XPUSHs (scalar); 1521 XPUSHs (scalar);
1267} 1522}
1268 1523
1269void decode_cbor (SV *cborstr) 1524void decode_cbor (SV *cborstr)

Diff Legend

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