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

Diff Legend

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