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.45 by root, Sun Dec 14 05:48:39 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
329 if (SvMAGICAL (av))
283 for (i = 0; i <= len; ++i) 330 for (i = 0; i <= len; ++i)
284 { 331 {
285 SV **svp = av_fetch (av, i, 0); 332 SV **svp = av_fetch (av, i, 0);
286 encode_sv (enc, svp ? *svp : &PL_sv_undef); 333 encode_sv (enc, svp ? *svp : &PL_sv_undef);
287 } 334 }
335 else
336 for (i = 0; i <= len; ++i)
337 encode_sv (enc, AvARRAY (av)[i]);
288 338
289 --enc->depth; 339 --enc->depth;
290} 340}
291 341
292static void 342static void
… …
301 351
302 int pairs = hv_iterinit (hv); 352 int pairs = hv_iterinit (hv);
303 int mg = SvMAGICAL (hv); 353 int mg = SvMAGICAL (hv);
304 354
305 if (mg) 355 if (mg)
306 encode_ch (enc, 0xa0 | 31); 356 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
307 else 357 else
308 encode_uint (enc, 0xa0, pairs); 358 encode_uint (enc, MAJOR_MAP, pairs);
309 359
310 while ((he = hv_iternext (hv))) 360 while ((he = hv_iternext (hv)))
311 { 361 {
312 if (HeKLEN (he) == HEf_SVKEY) 362 if (HeKLEN (he) == HEf_SVKEY)
313 encode_sv (enc, HeSVKEY (he)); 363 encode_sv (enc, HeSVKEY (he));
… …
316 366
317 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 367 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
318 } 368 }
319 369
320 if (mg) 370 if (mg)
321 encode_ch (enc, 0xe0 | 31); 371 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
322 372
323 --enc->depth; 373 --enc->depth;
324} 374}
325 375
326// encode objects, arrays and special \0=false and \1=true values. 376// encode objects, arrays and special \0=false and \1=true values.
… …
345 395
346 HV *stash = SvSTASH (sv); 396 HV *stash = SvSTASH (sv);
347 397
348 if (stash == boolean_stash) 398 if (stash == boolean_stash)
349 { 399 {
350 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 400 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
351 return; 401 return;
352 } 402 }
353 else if (stash == error_stash) 403 else if (stash == error_stash)
354 { 404 {
355 encode_ch (enc, 0xe0 | 23); 405 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
356 return; 406 return;
357 } 407 }
358 else if (stash == tagged_stash) 408 else if (stash == tagged_stash)
359 { 409 {
360 if (svt != SVt_PVAV) 410 if (svt != SVt_PVAV)
361 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 411 croak ("encountered CBOR::XS::Tagged object that isn't an array");
362 412
363 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 413 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
364 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 414 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
365 415
366 return; 416 return;
367 } 417 }
368 } 418 }
… …
376 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 426 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
377 427
378 if (SvOK (*svp)) 428 if (SvOK (*svp))
379 { 429 {
380 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF); 430 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
381 encode_uint (enc, 0x00, SvUV (*svp)); 431 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
382 return; 432 return;
383 } 433 }
384 else 434 else
385 { 435 {
386 sv_setuv (*svp, enc->shareable_idx); 436 sv_setuv (*svp, enc->shareable_idx);
… …
434 // catch this surprisingly common error 484 // catch this surprisingly common error
435 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 485 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)); 486 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
437 487
438 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 488 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
439 encode_uint (enc, 0x80, count + 1); 489 encode_uint (enc, MAJOR_ARRAY, count + 1);
440 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 490 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
441 491
442 while (count) 492 while (count)
443 encode_sv (enc, SP[1 - count--]); 493 encode_sv (enc, SP[1 - count--]);
444 494
… …
466{ 516{
467 double nv = SvNVX (sv); 517 double nv = SvNVX (sv);
468 518
469 need (enc, 9); 519 need (enc, 9);
470 520
471 if (ecb_expect_false (nv == (U32)nv)) 521 if (ecb_expect_false (nv == (NV)(U32)nv))
472 encode_uint (enc, 0x00, (U32)nv); 522 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
473 //TODO: maybe I32? 523 //TODO: maybe I32?
474 else if (ecb_expect_false (nv == (float)nv)) 524 else if (ecb_expect_false (nv == (float)nv))
475 { 525 {
476 uint32_t fp = ecb_float_to_binary32 (nv); 526 uint32_t fp = ecb_float_to_binary32 (nv);
477 527
478 *enc->cur++ = 0xe0 | 26; 528 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
479 529
480 if (!ecb_big_endian ()) 530 if (!ecb_big_endian ())
481 fp = ecb_bswap32 (fp); 531 fp = ecb_bswap32 (fp);
482 532
483 memcpy (enc->cur, &fp, 4); 533 memcpy (enc->cur, &fp, 4);
… …
485 } 535 }
486 else 536 else
487 { 537 {
488 uint64_t fp = ecb_double_to_binary64 (nv); 538 uint64_t fp = ecb_double_to_binary64 (nv);
489 539
490 *enc->cur++ = 0xe0 | 27; 540 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
491 541
492 if (!ecb_big_endian ()) 542 if (!ecb_big_endian ())
493 fp = ecb_bswap64 (fp); 543 fp = ecb_bswap64 (fp);
494 544
495 memcpy (enc->cur, &fp, 8); 545 memcpy (enc->cur, &fp, 8);
… …
511 else if (SvNOKp (sv)) 561 else if (SvNOKp (sv))
512 encode_nv (enc, sv); 562 encode_nv (enc, sv);
513 else if (SvIOKp (sv)) 563 else if (SvIOKp (sv))
514 { 564 {
515 if (SvIsUV (sv)) 565 if (SvIsUV (sv))
516 encode_uint (enc, 0x00, SvUVX (sv)); 566 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
517 else if (SvIVX (sv) >= 0) 567 else if (SvIVX (sv) >= 0)
518 encode_uint (enc, 0x00, SvIVX (sv)); 568 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
519 else 569 else
520 encode_uint (enc, 0x20, -(SvIVX (sv) + 1)); 570 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
521 } 571 }
522 else if (SvROK (sv)) 572 else if (SvROK (sv))
523 encode_rv (enc, SvRV (sv)); 573 encode_rv (enc, SvRV (sv));
524 else if (!SvOK (sv)) 574 else if (!SvOK (sv))
525 encode_ch (enc, 0xe0 | 22); 575 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
526 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 576 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
527 encode_ch (enc, 0xe0 | 23); 577 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
528 else 578 else
529 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data", 579 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
530 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 580 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
531} 581}
532 582
… …
585#define DEC_DEC_DEPTH --dec->depth 635#define DEC_DEC_DEPTH --dec->depth
586 636
587static UV 637static UV
588decode_uint (dec_t *dec) 638decode_uint (dec_t *dec)
589{ 639{
590 switch (*dec->cur & 31) 640 U8 m = *dec->cur & MINOR_MASK;
591 { 641 ++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 642
597 case 24: 643 if (ecb_expect_true (m < LENGTH_EXT1))
644 return m;
645 else if (ecb_expect_true (m == LENGTH_EXT1))
646 {
598 WANT (2); 647 WANT (1);
599 dec->cur += 2; 648 dec->cur += 1;
600 return dec->cur[-1]; 649 return dec->cur[-1];
601 650 }
602 case 25: 651 else if (ecb_expect_true (m == LENGTH_EXT2))
652 {
603 WANT (3); 653 WANT (2);
604 dec->cur += 3; 654 dec->cur += 2;
605 return (((UV)dec->cur[-2]) << 8) 655 return (((UV)dec->cur[-2]) << 8)
606 | ((UV)dec->cur[-1]); 656 | ((UV)dec->cur[-1]);
607 657 }
608 case 26: 658 else if (ecb_expect_true (m == LENGTH_EXT4))
659 {
609 WANT (5); 660 WANT (4);
610 dec->cur += 5; 661 dec->cur += 4;
611 return (((UV)dec->cur[-4]) << 24) 662 return (((UV)dec->cur[-4]) << 24)
612 | (((UV)dec->cur[-3]) << 16) 663 | (((UV)dec->cur[-3]) << 16)
613 | (((UV)dec->cur[-2]) << 8) 664 | (((UV)dec->cur[-2]) << 8)
614 | ((UV)dec->cur[-1]); 665 | ((UV)dec->cur[-1]);
615 666 }
616 case 27: 667 else if (ecb_expect_true (m == LENGTH_EXT8))
668 {
617 WANT (9); 669 WANT (8);
618 dec->cur += 9; 670 dec->cur += 8;
619 671
620 return 672 return
621#if UVSIZE < 8 673#if UVSIZE < 8
622 0 674 0
623#else 675#else
624 (((UV)dec->cur[-8]) << 56) 676 (((UV)dec->cur[-8]) << 56)
625 | (((UV)dec->cur[-7]) << 48) 677 | (((UV)dec->cur[-7]) << 48)
626 | (((UV)dec->cur[-6]) << 40) 678 | (((UV)dec->cur[-6]) << 40)
627 | (((UV)dec->cur[-5]) << 32) 679 | (((UV)dec->cur[-5]) << 32)
628#endif 680#endif
629 | (((UV)dec->cur[-4]) << 24) 681 | (((UV)dec->cur[-4]) << 24)
630 | (((UV)dec->cur[-3]) << 16) 682 | (((UV)dec->cur[-3]) << 16)
631 | (((UV)dec->cur[-2]) << 8) 683 | (((UV)dec->cur[-2]) << 8)
632 | ((UV)dec->cur[-1]); 684 | ((UV)dec->cur[-1]);
633 685 }
634 default: 686 else
635 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 687 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
636 }
637 688
638fail: 689fail:
639 return 0; 690 return 0;
640} 691}
641 692
… …
646{ 697{
647 AV *av = newAV (); 698 AV *av = newAV ();
648 699
649 DEC_INC_DEPTH; 700 DEC_INC_DEPTH;
650 701
651 if ((*dec->cur & 31) == 31) 702 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
652 { 703 {
653 ++dec->cur; 704 ++dec->cur;
654 705
655 for (;;) 706 for (;;)
656 { 707 {
657 WANT (1); 708 WANT (1);
658 709
659 if (*dec->cur == (0xe0 | 31)) 710 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
660 { 711 {
661 ++dec->cur; 712 ++dec->cur;
662 break; 713 break;
663 } 714 }
664 715
… …
667 } 718 }
668 else 719 else
669 { 720 {
670 int i, len = decode_uint (dec); 721 int i, len = decode_uint (dec);
671 722
723 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); 724 av_fill (av, len - 1);
673 725
674 for (i = 0; i < len; ++i) 726 for (i = 0; i < len; ++i)
675 AvARRAY (av)[i] = decode_sv (dec); 727 AvARRAY (av)[i] = decode_sv (dec);
676 } 728 }
… …
689{ 741{
690 // for speed reasons, we specialcase single-string 742 // for speed reasons, we specialcase single-string
691 // byte or utf-8 strings as keys, but only when !stringref 743 // byte or utf-8 strings as keys, but only when !stringref
692 744
693 if (ecb_expect_true (!dec->stringref)) 745 if (ecb_expect_true (!dec->stringref))
694 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27) 746 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
695 { 747 {
696 I32 len = decode_uint (dec); 748 I32 len = decode_uint (dec);
697 char *key = (char *)dec->cur; 749 char *key = (char *)dec->cur;
698 750
699 dec->cur += len; 751 dec->cur += len;
700 752
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); 753 hv_store (hv, key, len, decode_sv (dec), 0);
705 754
706 return; 755 return;
707 } 756 }
708 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27) 757 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
709 { 758 {
710 I32 len = decode_uint (dec); 759 I32 len = decode_uint (dec);
711 char *key = (char *)dec->cur; 760 char *key = (char *)dec->cur;
712 761
713 dec->cur += len; 762 dec->cur += len;
714 763
715 if (ecb_expect_false (dec->stringref)) 764 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
716 av_push (dec->stringref, newSVpvn_utf8 (key, len, 1)); 765 if (!is_utf8_string (key, len))
766 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
717 767
718 hv_store (hv, key, -len, decode_sv (dec), 0); 768 hv_store (hv, key, -len, decode_sv (dec), 0);
719 769
720 return; 770 return;
721 } 771 }
… …
723 SV *k = decode_sv (dec); 773 SV *k = decode_sv (dec);
724 SV *v = decode_sv (dec); 774 SV *v = decode_sv (dec);
725 775
726 hv_store_ent (hv, k, v, 0); 776 hv_store_ent (hv, k, v, 0);
727 SvREFCNT_dec (k); 777 SvREFCNT_dec (k);
778
779fail:
780 ;
728} 781}
729 782
730static SV * 783static SV *
731decode_hv (dec_t *dec) 784decode_hv (dec_t *dec)
732{ 785{
733 HV *hv = newHV (); 786 HV *hv = newHV ();
734 787
735 DEC_INC_DEPTH; 788 DEC_INC_DEPTH;
736 789
737 if ((*dec->cur & 31) == 31) 790 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
738 { 791 {
739 ++dec->cur; 792 ++dec->cur;
740 793
741 for (;;) 794 for (;;)
742 { 795 {
743 WANT (1); 796 WANT (1);
744 797
745 if (*dec->cur == (0xe0 | 31)) 798 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
746 { 799 {
747 ++dec->cur; 800 ++dec->cur;
748 break; 801 break;
749 } 802 }
750 803
… …
771static SV * 824static SV *
772decode_str (dec_t *dec, int utf8) 825decode_str (dec_t *dec, int utf8)
773{ 826{
774 SV *sv = 0; 827 SV *sv = 0;
775 828
776 if ((*dec->cur & 31) == 31) 829 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF)
777 { 830 {
778 // indefinite length strings 831 // indefinite length strings
779 ++dec->cur; 832 ++dec->cur;
780 833
781 unsigned char major = *dec->cur & 0xe0; 834 U8 major = *dec->cur & MAJOR_MISC;
782 835
783 sv = newSVpvn ("", 0); 836 sv = newSVpvn ("", 0);
784 837
785 for (;;) 838 for (;;)
786 { 839 {
787 WANT (1); 840 WANT (1);
788 841
789 if ((*dec->cur ^ major) >= 31) 842 if ((*dec->cur - major) > LENGTH_EXT8)
790 if (*dec->cur == (0xe0 | 31)) 843 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
791 { 844 {
792 ++dec->cur; 845 ++dec->cur;
793 break; 846 break;
794 } 847 }
795 else 848 else
… …
814 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1)) 867 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
815 av_push (dec->stringref, SvREFCNT_inc_NN (sv)); 868 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
816 } 869 }
817 870
818 if (utf8) 871 if (utf8)
872 {
873 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
874 if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
875 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
876
819 SvUTF8_on (sv); 877 SvUTF8_on (sv);
878 }
820 879
821 return sv; 880 return sv;
822 881
823fail: 882fail:
824 SvREFCNT_dec (sv); 883 SvREFCNT_dec (sv);
… …
856 } 915 }
857 break; 916 break;
858 917
859 case CBOR_TAG_STRINGREF: 918 case CBOR_TAG_STRINGREF:
860 { 919 {
861 if ((*dec->cur >> 5) != 0) 920 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
862 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 921 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
863 922
864 UV idx = decode_uint (dec); 923 UV idx = decode_uint (dec);
865 924
866 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 925 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))
… …
873 case CBOR_TAG_VALUE_SHAREABLE: 932 case CBOR_TAG_VALUE_SHAREABLE:
874 { 933 {
875 if (ecb_expect_false (!dec->shareable)) 934 if (ecb_expect_false (!dec->shareable))
876 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ()); 935 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
877 936
937 if (dec->cbor.flags & F_ALLOW_CYCLES)
938 {
878 sv = newSV (0); 939 sv = newSV (0);
879 av_push (dec->shareable, SvREFCNT_inc_NN (sv)); 940 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
880 941
881 SV *osv = decode_sv (dec); 942 SV *osv = decode_sv (dec);
882 sv_setsv (sv, osv); 943 sv_setsv (sv, osv);
883 SvREFCNT_dec_NN (osv); 944 SvREFCNT_dec_NN (osv);
945 }
946 else
947 {
948 av_push (dec->shareable, &PL_sv_undef);
949 int idx = AvFILLp (dec->shareable);
950 sv = decode_sv (dec);
951 av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
952 }
884 } 953 }
885 break; 954 break;
886 955
887 case CBOR_TAG_VALUE_SHAREDREF: 956 case CBOR_TAG_VALUE_SHAREDREF:
888 { 957 {
889 if ((*dec->cur >> 5) != 0) 958 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
890 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 959 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
891 960
892 UV idx = decode_uint (dec); 961 UV idx = decode_uint (dec);
893 962
894 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 963 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))
895 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 964 ERR ("corrupted CBOR data (sharedref index out of bounds)");
896 965
897 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 966 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
967
968 if (sv == &PL_sv_undef)
969 ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
898 } 970 }
899 break; 971 break;
900 972
901 case CBOR_TAG_PERL_OBJECT: 973 case CBOR_TAG_PERL_OBJECT:
902 { 974 {
… …
1003static SV * 1075static SV *
1004decode_sv (dec_t *dec) 1076decode_sv (dec_t *dec)
1005{ 1077{
1006 WANT (1); 1078 WANT (1);
1007 1079
1008 switch (*dec->cur >> 5) 1080 switch (*dec->cur >> MAJOR_SHIFT)
1009 { 1081 {
1010 case 0: // unsigned int 1082 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
1011 return newSVuv (decode_uint (dec)); 1083 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
1012 case 1: // negative int 1084 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
1013 return newSViv (-1 - (IV)decode_uint (dec)); 1085 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
1014 case 2: // octet string 1086 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
1015 return decode_str (dec, 0); 1087 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
1016 case 3: // utf-8 string 1088 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
1017 return decode_str (dec, 1); 1089
1018 case 4: // array 1090 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) 1091 switch (*dec->cur++ & MINOR_MASK)
1026 { 1092 {
1027 case 20: 1093 case SIMPLE_FALSE:
1028#if CBOR_SLOW 1094#if CBOR_SLOW
1029 types_false = get_bool ("Types::Serialiser::false"); 1095 types_false = get_bool ("Types::Serialiser::false");
1030#endif 1096#endif
1031 return newSVsv (types_false); 1097 return newSVsv (types_false);
1032 case 21: 1098 case SIMPLE_TRUE:
1033#if CBOR_SLOW 1099#if CBOR_SLOW
1034 types_true = get_bool ("Types::Serialiser::true"); 1100 types_true = get_bool ("Types::Serialiser::true");
1035#endif 1101#endif
1036 return newSVsv (types_true); 1102 return newSVsv (types_true);
1037 case 22: 1103 case SIMPLE_NULL:
1038 return newSVsv (&PL_sv_undef); 1104 return newSVsv (&PL_sv_undef);
1039 case 23: 1105 case SIMPLE_UNDEF:
1040#if CBOR_SLOW 1106#if CBOR_SLOW
1041 types_error = get_bool ("Types::Serialiser::error"); 1107 types_error = get_bool ("Types::Serialiser::error");
1042#endif 1108#endif
1043 return newSVsv (types_error); 1109 return newSVsv (types_error);
1044 1110
1045 case 25: 1111 case MISC_FLOAT16:
1046 { 1112 {
1047 WANT (2); 1113 WANT (2);
1048 1114
1049 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1115 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
1050 dec->cur += 2; 1116 dec->cur += 2;
1051 1117
1052 return newSVnv (ecb_binary16_to_float (fp)); 1118 return newSVnv (ecb_binary16_to_float (fp));
1053 } 1119 }
1054 1120
1055 case 26: 1121 case MISC_FLOAT32:
1056 { 1122 {
1057 uint32_t fp; 1123 uint32_t fp;
1058 WANT (4); 1124 WANT (4);
1059 memcpy (&fp, dec->cur, 4); 1125 memcpy (&fp, dec->cur, 4);
1060 dec->cur += 4; 1126 dec->cur += 4;
… …
1063 fp = ecb_bswap32 (fp); 1129 fp = ecb_bswap32 (fp);
1064 1130
1065 return newSVnv (ecb_binary32_to_float (fp)); 1131 return newSVnv (ecb_binary32_to_float (fp));
1066 } 1132 }
1067 1133
1068 case 27: 1134 case MISC_FLOAT64:
1069 { 1135 {
1070 uint64_t fp; 1136 uint64_t fp;
1071 WANT (8); 1137 WANT (8);
1072 memcpy (&fp, dec->cur, 8); 1138 memcpy (&fp, dec->cur, 8);
1073 dec->cur += 8; 1139 dec->cur += 8;
… …
1076 fp = ecb_bswap64 (fp); 1142 fp = ecb_bswap64 (fp);
1077 1143
1078 return newSVnv (ecb_binary64_to_double (fp)); 1144 return newSVnv (ecb_binary64_to_double (fp));
1079 } 1145 }
1080 1146
1081 // 0..19 unassigned 1147 // 0..19 unassigned simple
1082 // 24 reserved + unassigned (reserved values are not encodable) 1148 // 24 reserved + unassigned simple (reserved values are not encodable)
1149 // 28-30 unassigned misc
1150 // 31 break code
1083 default: 1151 default:
1084 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1152 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1085 } 1153 }
1086 1154
1087 break; 1155 break;
1088 } 1156 }
1089 1157
… …
1116 if (dec.cur != dec.end && !dec.err) 1184 if (dec.cur != dec.end && !dec.err)
1117 dec.err = "garbage after CBOR object"; 1185 dec.err = "garbage after CBOR object";
1118 1186
1119 if (dec.err) 1187 if (dec.err)
1120 { 1188 {
1189 if (dec.shareable)
1190 {
1191 // need to break cyclic links, which whould all be in shareable
1192 int i;
1193 SV **svp;
1194
1195 for (i = av_len (dec.shareable) + 1; i--; )
1196 if ((svp = av_fetch (dec.shareable, i, 0)))
1197 sv_setsv (*svp, &PL_sv_undef);
1198 }
1199
1121 SvREFCNT_dec (sv); 1200 SvREFCNT_dec (sv);
1122 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1201 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1123 } 1202 }
1124 1203
1125 sv = sv_2mortal (sv); 1204 sv = sv_2mortal (sv);
1126 1205
1127 return sv; 1206 return sv;
1128} 1207}
1129 1208
1209/////////////////////////////////////////////////////////////////////////////
1210// incremental parser
1211
1212#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
1213
1214// returns 0 for notyet, 1 for success or error
1215static int
1216incr_parse (CBOR *self, SV *cborstr)
1217{
1218 STRLEN cur;
1219 SvPV (cborstr, cur);
1220
1221 while (ecb_expect_true (self->incr_need <= cur))
1222 {
1223 // table of integer count bytes
1224 static I8 incr_len[MINOR_MASK + 1] = {
1225 0, 0, 0, 0, 0, 0, 0, 0,
1226 0, 0, 0, 0, 0, 0, 0, 0,
1227 0, 0, 0, 0, 0, 0, 0, 0,
1228 1, 2, 4, 8,-1,-1,-1,-2
1229 };
1230
1231 const U8 *p = SvPVX (cborstr) + self->incr_pos;
1232 U8 m = *p & MINOR_MASK;
1233 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1234 I8 ilen = incr_len[m];
1235
1236 self->incr_need = self->incr_pos + 1;
1237
1238 if (ecb_expect_false (ilen < 0))
1239 {
1240 if (m != MINOR_INDEF)
1241 return 1; // error
1242
1243 if (*p == (MAJOR_MISC | MINOR_INDEF))
1244 {
1245 if (count >= 0)
1246 return 1; // error
1247
1248 count = 1;
1249 }
1250 else
1251 {
1252 av_push (self->incr_count, newSViv (-1)); //TODO: nest
1253 count = -1;
1254 }
1255 }
1256 else
1257 {
1258 self->incr_need += ilen;
1259 if (ecb_expect_false (self->incr_need > cur))
1260 return 0;
1261
1262 int major = *p >> MAJOR_SHIFT;
1263
1264 switch (major)
1265 {
1266 case MAJOR_BYTES >> MAJOR_SHIFT:
1267 case MAJOR_TEXT >> MAJOR_SHIFT:
1268 case MAJOR_ARRAY >> MAJOR_SHIFT:
1269 case MAJOR_MAP >> MAJOR_SHIFT:
1270 {
1271 UV len;
1272
1273 if (ecb_expect_false (ilen))
1274 {
1275 len = 0;
1276
1277 do {
1278 len = (len << 8) | *++p;
1279 } while (--ilen);
1280 }
1281 else
1282 len = m;
1283
1284 switch (major)
1285 {
1286 case MAJOR_BYTES >> MAJOR_SHIFT:
1287 case MAJOR_TEXT >> MAJOR_SHIFT:
1288 self->incr_need += len;
1289 if (ecb_expect_false (self->incr_need > cur))
1290 return 0;
1291
1292 break;
1293
1294 case MAJOR_MAP >> MAJOR_SHIFT:
1295 len <<= 1;
1296 case MAJOR_ARRAY >> MAJOR_SHIFT:
1297 if (len)
1298 {
1299 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1300 count = len + 1;
1301 }
1302 break;
1303 }
1304 }
1305 }
1306 }
1307
1308 self->incr_pos = self->incr_need;
1309
1310 if (count > 0)
1311 {
1312 while (!--count)
1313 {
1314 if (!AvFILLp (self->incr_count))
1315 return 1; // done
1316
1317 SvREFCNT_dec_NN (av_pop (self->incr_count));
1318 count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1319 }
1320
1321 SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
1322 }
1323 }
1324
1325 return 0;
1326}
1327
1328
1130///////////////////////////////////////////////////////////////////////////// 1329/////////////////////////////////////////////////////////////////////////////
1131// XS interface functions 1330// XS interface functions
1132 1331
1133MODULE = CBOR::XS PACKAGE = CBOR::XS 1332MODULE = CBOR::XS PACKAGE = CBOR::XS
1134 1333
… …
1174void shrink (CBOR *self, int enable = 1) 1373void shrink (CBOR *self, int enable = 1)
1175 ALIAS: 1374 ALIAS:
1176 shrink = F_SHRINK 1375 shrink = F_SHRINK
1177 allow_unknown = F_ALLOW_UNKNOWN 1376 allow_unknown = F_ALLOW_UNKNOWN
1178 allow_sharing = F_ALLOW_SHARING 1377 allow_sharing = F_ALLOW_SHARING
1378 allow_cycles = F_ALLOW_CYCLES
1179 pack_strings = F_PACK_STRINGS 1379 pack_strings = F_PACK_STRINGS
1380 validate_utf8 = F_VALIDATE_UTF8
1180 PPCODE: 1381 PPCODE:
1181{ 1382{
1182 if (enable) 1383 if (enable)
1183 self->flags |= ix; 1384 self->flags |= ix;
1184 else 1385 else
… …
1190void get_shrink (CBOR *self) 1391void get_shrink (CBOR *self)
1191 ALIAS: 1392 ALIAS:
1192 get_shrink = F_SHRINK 1393 get_shrink = F_SHRINK
1193 get_allow_unknown = F_ALLOW_UNKNOWN 1394 get_allow_unknown = F_ALLOW_UNKNOWN
1194 get_allow_sharing = F_ALLOW_SHARING 1395 get_allow_sharing = F_ALLOW_SHARING
1396 get_allow_cycles = F_ALLOW_CYCLES
1195 get_pack_strings = F_PACK_STRINGS 1397 get_pack_strings = F_PACK_STRINGS
1398 get_validate_utf8 = F_VALIDATE_UTF8
1196 PPCODE: 1399 PPCODE:
1197 XPUSHs (boolSV (self->flags & ix)); 1400 XPUSHs (boolSV (self->flags & ix));
1198 1401
1199void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1402void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1200 PPCODE: 1403 PPCODE:
… …
1249 EXTEND (SP, 2); 1452 EXTEND (SP, 2);
1250 PUSHs (sv); 1453 PUSHs (sv);
1251 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1454 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1252} 1455}
1253 1456
1457void incr_parse (CBOR *self, SV *cborstr)
1458 ALIAS:
1459 incr_parse_multiple = 1
1460 PPCODE:
1461{
1462 if (SvUTF8 (cborstr))
1463 sv_utf8_downgrade (cborstr, 0);
1464
1465 if (!self->incr_count)
1466 {
1467 self->incr_count = newAV ();
1468 self->incr_pos = 0;
1469 self->incr_need = 1;
1470
1471 av_push (self->incr_count, newSViv (1));
1472 }
1473
1474 do
1475 {
1476 if (!incr_parse (self, cborstr))
1477 {
1478 if (self->incr_need > self->max_size && self->max_size)
1479 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1480 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1481
1482 break;
1483 }
1484
1485 SV *sv;
1486 char *offset;
1487
1488 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1489 XPUSHs (sv);
1490
1491 sv_chop (cborstr, offset);
1492
1493 av_clear (self->incr_count);
1494 av_push (self->incr_count, newSViv (1));
1495
1496 self->incr_pos = 0;
1497 self->incr_need = self->incr_pos + 1;
1498 }
1499 while (ix);
1500}
1501
1502void incr_reset (CBOR *self)
1503 CODE:
1504{
1505 SvREFCNT_dec (self->incr_count);
1506 self->incr_count = 0;
1507}
1508
1254void DESTROY (CBOR *self) 1509void DESTROY (CBOR *self)
1255 PPCODE: 1510 PPCODE:
1256 cbor_free (self); 1511 cbor_free (self);
1257 1512
1258PROTOTYPES: ENABLE 1513PROTOTYPES: ENABLE
1259 1514
1260void encode_cbor (SV *scalar) 1515void encode_cbor (SV *scalar)
1516 ALIAS:
1517 encode_cbor = 0
1518 encode_cbor_sharing = F_ALLOW_SHARING
1261 PPCODE: 1519 PPCODE:
1262{ 1520{
1263 CBOR cbor; 1521 CBOR cbor;
1264 cbor_init (&cbor); 1522 cbor_init (&cbor);
1523 cbor.flags |= ix;
1265 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1524 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1266 XPUSHs (scalar); 1525 XPUSHs (scalar);
1267} 1526}
1268 1527
1269void decode_cbor (SV *cborstr) 1528void decode_cbor (SV *cborstr)

Diff Legend

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