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.39 by root, Sun Dec 1 14:45:03 2013 UTC vs.
Revision 1.66 by root, Sun Nov 29 21:32:01 2020 UTC

… …
6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
13#define ECB_NO_THREADS 1
12#include "ecb.h" 14#include "ecb.h"
13 15
14// compatibility with perl <5.18 16// compatibility with perl <5.18
15#ifndef HvNAMELEN_get 17#ifndef HvNAMELEN_get
16# define HvNAMELEN_get(hv) strlen (HvNAME (hv)) 18# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
… …
19# define HvNAMELEN(hv) HvNAMELEN_get (hv) 21# define HvNAMELEN(hv) HvNAMELEN_get (hv)
20#endif 22#endif
21#ifndef HvNAMEUTF8 23#ifndef HvNAMEUTF8
22# define HvNAMEUTF8(hv) 0 24# define HvNAMEUTF8(hv) 0
23#endif 25#endif
26#ifndef SvREFCNT_inc_NN
27# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
28#endif
24#ifndef SvREFCNT_dec_NN 29#ifndef SvREFCNT_dec_NN
25# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv) 30# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
26#endif 31#endif
27 32
28// known major and minor types 33// known major and minor types
… …
94 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
95 100
96 CBOR_TAG_MAGIC = 55799, // self-describe cbor 101 CBOR_TAG_MAGIC = 55799, // self-describe cbor
97}; 102};
98 103
104// known forced types, also hardcoded in CBOR.pm
105enum
106{
107 AS_CBOR = 0,
108 AS_BYTES = 1,
109 AS_TEXT = 2,
110 AS_FLOAT16 = 3,
111 AS_FLOAT32 = 4,
112 AS_FLOAT64 = 5,
113 // possibly future enhancements: float, integer
114};
115
99#define F_SHRINK 0x00000001UL 116#define F_SHRINK 0x00000001UL
100#define F_ALLOW_UNKNOWN 0x00000002UL 117#define F_ALLOW_UNKNOWN 0x00000002UL
101#define F_ALLOW_SHARING 0x00000004UL 118#define F_ALLOW_SHARING 0x00000004UL
102#define F_ALLOW_CYCLES 0x00000008UL 119#define F_ALLOW_CYCLES 0x00000008UL
120#define F_FORBID_OBJECTS 0x00000010UL
103#define F_PACK_STRINGS 0x00000010UL 121#define F_PACK_STRINGS 0x00000020UL
122#define F_TEXT_KEYS 0x00000040UL
123#define F_TEXT_STRINGS 0x00000080UL
104#define F_VALIDATE_UTF8 0x00000020UL 124#define F_VALIDATE_UTF8 0x00000100UL
105 125
106#define INIT_SIZE 32 // initial scalar size to be allocated 126#define INIT_SIZE 32 // initial scalar size to be allocated
107 127
108#define SB do { 128#define SB do {
109#define SE } while (0) 129#define SE } while (0)
… …
128typedef struct { 148typedef struct {
129 U32 flags; 149 U32 flags;
130 U32 max_depth; 150 U32 max_depth;
131 STRLEN max_size; 151 STRLEN max_size;
132 SV *filter; 152 SV *filter;
153
154 // for the incremental parser
155 STRLEN incr_pos; // the current offset into the text
156 STRLEN incr_need; // minimum bytes needed to decode
157 AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
133} CBOR; 158} CBOR;
134 159
135ecb_inline void 160ecb_inline void
136cbor_init (CBOR *cbor) 161cbor_init (CBOR *cbor)
137{ 162{
… …
141 166
142ecb_inline void 167ecb_inline void
143cbor_free (CBOR *cbor) 168cbor_free (CBOR *cbor)
144{ 169{
145 SvREFCNT_dec (cbor->filter); 170 SvREFCNT_dec (cbor->filter);
171 SvREFCNT_dec (cbor->incr_count);
146} 172}
147 173
148///////////////////////////////////////////////////////////////////////////// 174/////////////////////////////////////////////////////////////////////////////
149// utility functions 175// utility functions
150 176
… …
176 202
177// minimum length of a string to be registered for stringref 203// minimum length of a string to be registered for stringref
178ecb_inline int 204ecb_inline int
179minimum_string_length (UV idx) 205minimum_string_length (UV idx)
180{ 206{
181 return idx > 23 207 return idx <= 23 ? 3
182 ? idx > 0xffU 208 : idx <= 0xffU ? 4
183 ? idx > 0xffffU 209 : idx <= 0xffffU ? 5
184 ? idx > 0xffffffffU 210 : idx <= 0xffffffffU ? 7
185 ? 11 211 : 11;
186 : 7
187 : 5
188 : 4
189 : 3;
190} 212}
191 213
192///////////////////////////////////////////////////////////////////////////// 214/////////////////////////////////////////////////////////////////////////////
193// encoder 215// encoder
194 216
… …
207} enc_t; 229} enc_t;
208 230
209ecb_inline void 231ecb_inline void
210need (enc_t *enc, STRLEN len) 232need (enc_t *enc, STRLEN len)
211{ 233{
212 if (ecb_expect_false (enc->cur + len >= enc->end)) 234 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
213 { 235 {
214 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 236 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
215 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 237 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
216 enc->cur = SvPVX (enc->sv) + cur; 238 enc->cur = SvPVX (enc->sv) + cur;
217 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 239 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
… …
223{ 245{
224 need (enc, 1); 246 need (enc, 1);
225 *enc->cur++ = ch; 247 *enc->cur++ = ch;
226} 248}
227 249
250// used for tags, intregers, element counts and so on
228static void 251static void
229encode_uint (enc_t *enc, int major, UV len) 252encode_uint (enc_t *enc, int major, UV len)
230{ 253{
231 need (enc, 9); 254 need (enc, 9);
232 255
… …
263 *enc->cur++ = len >> 8; 286 *enc->cur++ = len >> 8;
264 *enc->cur++ = len; 287 *enc->cur++ = len;
265 } 288 }
266} 289}
267 290
291// encodes a perl value into a CBOR integer
292ecb_inline
293encode_int (enc_t *enc, SV *sv)
294{
295 if (SvIsUV (sv))
296 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
297 else if (SvIVX (sv) >= 0)
298 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
299 else
300 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
301}
302
268ecb_inline void 303ecb_inline void
269encode_tag (enc_t *enc, UV tag) 304encode_tag (enc_t *enc, UV tag)
270{ 305{
271 encode_uint (enc, MAJOR_TAG, tag); 306 encode_uint (enc, MAJOR_TAG, tag);
272} 307}
273 308
309// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
310ecb_noinline static void
311encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
312{
313 STRLEN ulen = len;
314 U8 *p, *pend = (U8 *)str + len;
315
316 for (p = (U8 *)str; p < pend; ++p)
317 ulen += *p >> 7; // count set high bits
318
319 encode_uint (enc, MAJOR_TEXT, ulen);
320
321 need (enc, ulen);
322 for (p = (U8 *)str; p < pend; ++p)
323 if (*p < 0x80)
324 *enc->cur++ = *p;
325 else
326 {
327 *enc->cur++ = 0xc0 + (*p >> 6);
328 *enc->cur++ = 0x80 + (*p & 63);
329 }
330}
331
274ecb_inline void 332ecb_inline void
275encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 333encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
276{ 334{
335 if (ecb_expect_false (upgrade_utf8))
336 if (!utf8)
337 {
338 encode_str_utf8 (enc, utf8, str, len);
339 return;
340 }
341
277 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 342 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
278 need (enc, len); 343 need (enc, len);
279 memcpy (enc->cur, str, len); 344 memcpy (enc->cur, str, len);
280 enc->cur += len; 345 enc->cur += len;
281} 346}
282 347
283static void 348ecb_inline void
284encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 349encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
285{ 350{
286 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 351 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
287 { 352 {
288 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 353 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
289 354
… …
300 sv_setuv (*svp, enc->stringref_idx); 365 sv_setuv (*svp, enc->stringref_idx);
301 ++enc->stringref_idx; 366 ++enc->stringref_idx;
302 } 367 }
303 } 368 }
304 369
305 encode_str (enc, utf8, str, len); 370 encode_str (enc, upgrade_utf8, utf8, str, len);
371}
372
373ecb_inline void
374encode_float16 (enc_t *enc, NV nv)
375{
376 need (enc, 1+2);
377
378 *enc->cur++ = MAJOR_MISC | MISC_FLOAT16;
379
380 uint16_t fp = ecb_float_to_binary16 (nv);
381
382 if (!ecb_big_endian ())
383 fp = ecb_bswap16 (fp);
384
385 memcpy (enc->cur, &fp, 2);
386 enc->cur += 2;
387}
388
389ecb_inline void
390encode_float32 (enc_t *enc, NV nv)
391{
392 need (enc, 1+4);
393
394 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
395
396 uint32_t fp = ecb_float_to_binary32 (nv);
397
398 if (!ecb_big_endian ())
399 fp = ecb_bswap32 (fp);
400
401 memcpy (enc->cur, &fp, 4);
402 enc->cur += 4;
403}
404
405ecb_inline void
406encode_float64 (enc_t *enc, NV nv)
407{
408 need (enc, 1+8);
409
410 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
411
412 uint64_t fp = ecb_double_to_binary64 (nv);
413
414 if (!ecb_big_endian ())
415 fp = ecb_bswap64 (fp);
416
417 memcpy (enc->cur, &fp, 8);
418 enc->cur += 8;
419}
420
421ecb_inline void
422encode_forced (enc_t *enc, UV type, SV *sv)
423{
424 switch (type)
425 {
426 case AS_CBOR:
427 {
428 STRLEN len;
429 char *str = SvPVbyte (sv, len);
430
431 need (enc, len);
432 memcpy (enc->cur, str, len);
433 enc->cur += len;
434 }
435 break;
436
437 case AS_BYTES:
438 {
439 STRLEN len;
440 char *str = SvPVbyte (sv, len);
441 encode_strref (enc, 0, 0, str, len);
442 }
443 break;
444
445 case AS_TEXT:
446 {
447 STRLEN len;
448 char *str = SvPVutf8 (sv, len);
449 encode_strref (enc, 1, 1, str, len);
450 }
451 break;
452
453 case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break;
454 case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break;
455 case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break;
456
457 default:
458 croak ("encountered malformed CBOR::XS::Tagged object");
459 }
306} 460}
307 461
308static void encode_sv (enc_t *enc, SV *sv); 462static void encode_sv (enc_t *enc, SV *sv);
309 463
310static void 464static void
… …
317 471
318 ++enc->depth; 472 ++enc->depth;
319 473
320 encode_uint (enc, MAJOR_ARRAY, len + 1); 474 encode_uint (enc, MAJOR_ARRAY, len + 1);
321 475
476 if (ecb_expect_false (SvMAGICAL (av)))
322 for (i = 0; i <= len; ++i) 477 for (i = 0; i <= len; ++i)
323 { 478 {
324 SV **svp = av_fetch (av, i, 0); 479 SV **svp = av_fetch (av, i, 0);
325 encode_sv (enc, svp ? *svp : &PL_sv_undef); 480 encode_sv (enc, svp ? *svp : &PL_sv_undef);
326 } 481 }
482 else
483 for (i = 0; i <= len; ++i)
484 {
485 SV *sv = AvARRAY (av)[i];
486 encode_sv (enc, sv ? sv : &PL_sv_undef);
487 }
327 488
328 --enc->depth; 489 --enc->depth;
329} 490}
330 491
331static void 492static void
… …
339 ++enc->depth; 500 ++enc->depth;
340 501
341 int pairs = hv_iterinit (hv); 502 int pairs = hv_iterinit (hv);
342 int mg = SvMAGICAL (hv); 503 int mg = SvMAGICAL (hv);
343 504
344 if (mg) 505 if (ecb_expect_false (mg))
345 encode_ch (enc, MAJOR_MAP | MINOR_INDEF); 506 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
346 else 507 else
347 encode_uint (enc, MAJOR_MAP, pairs); 508 encode_uint (enc, MAJOR_MAP, pairs);
348 509
349 while ((he = hv_iternext (hv))) 510 while ((he = hv_iternext (hv)))
350 { 511 {
351 if (HeKLEN (he) == HEf_SVKEY) 512 if (HeKLEN (he) == HEf_SVKEY)
352 encode_sv (enc, HeSVKEY (he)); 513 encode_sv (enc, HeSVKEY (he));
353 else 514 else
354 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 515 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
355 516
356 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 517 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
357 } 518 }
358 519
359 if (mg) 520 if (ecb_expect_false (mg))
360 encode_ch (enc, MAJOR_MISC | MINOR_INDEF); 521 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
361 522
362 --enc->depth; 523 --enc->depth;
363} 524}
364 525
… …
397 else if (stash == tagged_stash) 558 else if (stash == tagged_stash)
398 { 559 {
399 if (svt != SVt_PVAV) 560 if (svt != SVt_PVAV)
400 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 561 croak ("encountered CBOR::XS::Tagged object that isn't an array");
401 562
563 switch (av_len ((AV *)sv))
564 {
565 case 2-1:
566 // actually a tagged value
402 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); 567 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
403 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); 568 encode_sv (enc, *av_fetch ((AV *)sv, 1, 1));
569 break;
570
571 case 3-1:
572 // a forced type [value, type, undef]
573 encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1));
574 break;
575
576 default:
577 croak ("encountered malformed CBOR::XS::Tagged object");
578 }
404 579
405 return; 580 return;
406 } 581 }
407 } 582 }
408 583
409 if (ecb_expect_false (SvREFCNT (sv) > 1) 584 if (ecb_expect_false (SvREFCNT (sv) > 1)
410 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) 585 && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING))
411 { 586 {
412 if (!enc->shareable) 587 if (ecb_expect_false (!enc->shareable))
413 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); 588 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
414 589
415 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); 590 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
416 591
417 if (SvOK (*svp)) 592 if (SvOK (*svp))
… …
431 if (ecb_expect_false (SvOBJECT (sv))) 606 if (ecb_expect_false (SvOBJECT (sv)))
432 { 607 {
433 HV *stash = SvSTASH (sv); 608 HV *stash = SvSTASH (sv);
434 GV *method; 609 GV *method;
435 610
611 if (enc->cbor.flags & F_FORBID_OBJECTS)
612 croak ("encountered object '%s', but forbid_objects is enabled",
613 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
436 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 614 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
437 { 615 {
438 dSP; 616 dSP;
439 617
440 ENTER; SAVETMPS; PUSHMARK (SP); 618 ENTER; SAVETMPS;
619 PUSHMARK (SP);
441 // we re-bless the reference to get overload and other niceties right 620 // we re-bless the reference to get overload and other niceties right
442 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 621 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
443 622
444 PUTBACK; 623 PUTBACK;
445 // G_SCALAR ensures that return value is 1 624 // G_SCALAR ensures that return value is 1
… …
458 } 637 }
459 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 638 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
460 { 639 {
461 dSP; 640 dSP;
462 641
463 ENTER; SAVETMPS; PUSHMARK (SP); 642 ENTER; SAVETMPS;
643 PUSHMARK (SP);
464 EXTEND (SP, 2); 644 EXTEND (SP, 2);
465 // we re-bless the reference to get overload and other niceties right 645 // we re-bless the reference to get overload and other niceties right
466 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 646 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
467 PUSHs (sv_cbor); 647 PUSHs (sv_cbor);
468 648
… …
474 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 654 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
475 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 655 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
476 656
477 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 657 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
478 encode_uint (enc, MAJOR_ARRAY, count + 1); 658 encode_uint (enc, MAJOR_ARRAY, count + 1);
479 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 659 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
480 660
481 while (count) 661 {
662 int i;
663
664 for (i = 0; i < count; ++i)
482 encode_sv (enc, SP[1 - count--]); 665 encode_sv (enc, SP[i + 1 - count]);
666
667 SP -= count;
668 }
483 669
484 PUTBACK; 670 PUTBACK;
485 671
486 FREETMPS; LEAVE; 672 FREETMPS; LEAVE;
487 } 673 }
… …
509 695
510 if (ecb_expect_false (nv == (NV)(U32)nv)) 696 if (ecb_expect_false (nv == (NV)(U32)nv))
511 encode_uint (enc, MAJOR_POS_INT, (U32)nv); 697 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
512 //TODO: maybe I32? 698 //TODO: maybe I32?
513 else if (ecb_expect_false (nv == (float)nv)) 699 else if (ecb_expect_false (nv == (float)nv))
514 { 700 encode_float32 (enc, nv);
515 uint32_t fp = ecb_float_to_binary32 (nv);
516
517 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
518
519 if (!ecb_big_endian ())
520 fp = ecb_bswap32 (fp);
521
522 memcpy (enc->cur, &fp, 4);
523 enc->cur += 4;
524 }
525 else 701 else
526 { 702 encode_float64 (enc, nv);
527 uint64_t fp = ecb_double_to_binary64 (nv);
528
529 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
530
531 if (!ecb_big_endian ())
532 fp = ecb_bswap64 (fp);
533
534 memcpy (enc->cur, &fp, 8);
535 enc->cur += 8;
536 }
537} 703}
538 704
539static void 705static void
540encode_sv (enc_t *enc, SV *sv) 706encode_sv (enc_t *enc, SV *sv)
541{ 707{
… …
543 709
544 if (SvPOKp (sv)) 710 if (SvPOKp (sv))
545 { 711 {
546 STRLEN len; 712 STRLEN len;
547 char *str = SvPV (sv, len); 713 char *str = SvPV (sv, len);
548 encode_strref (enc, SvUTF8 (sv), str, len); 714 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
549 } 715 }
550 else if (SvNOKp (sv)) 716 else if (SvNOKp (sv))
551 encode_nv (enc, sv); 717 encode_nv (enc, sv);
552 else if (SvIOKp (sv)) 718 else if (SvIOKp (sv))
553 { 719 encode_int (e,v sv);
554 if (SvIsUV (sv))
555 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
556 else if (SvIVX (sv) >= 0)
557 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
558 else
559 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
560 }
561 else if (SvROK (sv)) 720 else if (SvROK (sv))
562 encode_rv (enc, SvRV (sv)); 721 encode_rv (enc, SvRV (sv));
563 else if (!SvOK (sv)) 722 else if (!SvOK (sv))
564 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); 723 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
565 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 724 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
… …
570} 729}
571 730
572static SV * 731static SV *
573encode_cbor (SV *scalar, CBOR *cbor) 732encode_cbor (SV *scalar, CBOR *cbor)
574{ 733{
575 enc_t enc = { }; 734 enc_t enc = { 0 };
576 735
577 enc.cbor = *cbor; 736 enc.cbor = *cbor;
578 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 737 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
579 enc.cur = SvPVX (enc.sv); 738 enc.cur = SvPVX (enc.sv);
580 enc.end = SvEND (enc.sv); 739 enc.end = SvEND (enc.sv);
581 740
582 SvPOK_only (enc.sv); 741 SvPOK_only (enc.sv);
583 742
584 if (cbor->flags & F_PACK_STRINGS) 743 if (cbor->flags & F_PACK_STRINGS)
585 { 744 {
… …
612 U32 depth; // recursion depth 771 U32 depth; // recursion depth
613 U32 maxdepth; // recursion depth limit 772 U32 maxdepth; // recursion depth limit
614 AV *shareable; 773 AV *shareable;
615 AV *stringref; 774 AV *stringref;
616 SV *decode_tagged; 775 SV *decode_tagged;
776 SV *err_sv; // optional sv for error, needs to be freed
617} dec_t; 777} dec_t;
618 778
619#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 779// set dec->err to ERRSV
780ecb_cold static void
781err_errsv (dec_t *dec)
782{
783 if (!dec->err)
784 {
785 dec->err_sv = newSVsv (ERRSV);
620 786
621#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 787 // chop off the trailing \n
788 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
789 *SvEND (dec->err_sv) = 0;
622 790
791 dec->err = SvPVutf8_nolen (dec->err_sv);
792 }
793}
794
795// the following functions are used to reduce code size and help the compiler to optimise
796ecb_cold static void
797err_set (dec_t *dec, const char *reason)
798{
799 if (!dec->err)
800 dec->err = reason;
801}
802
803ecb_cold static void
804err_unexpected_end (dec_t *dec)
805{
806 err_set (dec, "unexpected end of CBOR data");
807}
808
809#define ERR_DO(do) SB do; goto fail; SE
810#define ERR(reason) ERR_DO (err_set (dec, reason))
811#define ERR_ERRSV ERR_DO (err_errsv (dec))
812
813#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
814
623#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 815#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
624#define DEC_DEC_DEPTH --dec->depth 816#define DEC_DEC_DEPTH --dec->depth
625 817
626static UV 818static UV
627decode_uint (dec_t *dec) 819decode_uint (dec_t *dec)
628{ 820{
… …
694 886
695 for (;;) 887 for (;;)
696 { 888 {
697 WANT (1); 889 WANT (1);
698 890
699 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 891 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
700 { 892 {
701 ++dec->cur; 893 ++dec->cur;
702 break; 894 break;
703 } 895 }
704 896
705 av_push (av, decode_sv (dec)); 897 av_push (av, decode_sv (dec));
706 } 898 }
707 } 899 }
708 else 900 else
709 { 901 {
710 int i, len = decode_uint (dec); 902 UV i, len = decode_uint (dec);
711 903
712 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays 904 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
713 av_fill (av, len - 1); 905 av_fill (av, len - 1);
714 906
715 for (i = 0; i < len; ++i) 907 for (i = 0; i < len; ++i)
… …
718 910
719 DEC_DEC_DEPTH; 911 DEC_DEC_DEPTH;
720 return newRV_noinc ((SV *)av); 912 return newRV_noinc ((SV *)av);
721 913
722fail: 914fail:
723 SvREFCNT_dec (av); 915 SvREFCNT_dec_NN (av);
724 DEC_DEC_DEPTH; 916 DEC_DEC_DEPTH;
725 return &PL_sv_undef; 917 return &PL_sv_undef;
726} 918}
727 919
728static void 920static void
… …
730{ 922{
731 // for speed reasons, we specialcase single-string 923 // for speed reasons, we specialcase single-string
732 // byte or utf-8 strings as keys, but only when !stringref 924 // byte or utf-8 strings as keys, but only when !stringref
733 925
734 if (ecb_expect_true (!dec->stringref)) 926 if (ecb_expect_true (!dec->stringref))
735 if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 927 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
736 { 928 {
737 I32 len = decode_uint (dec); 929 STRLEN len = decode_uint (dec);
738 char *key = (char *)dec->cur; 930 char *key = (char *)dec->cur;
739 931
932 WANT (len);
740 dec->cur += len; 933 dec->cur += len;
741 934
742 hv_store (hv, key, len, decode_sv (dec), 0); 935 hv_store (hv, key, len, decode_sv (dec), 0);
743 936
744 return; 937 return;
745 } 938 }
746 else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 939 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
747 { 940 {
748 I32 len = decode_uint (dec); 941 STRLEN len = decode_uint (dec);
749 char *key = (char *)dec->cur; 942 char *key = (char *)dec->cur;
750 943
944 WANT (len);
751 dec->cur += len; 945 dec->cur += len;
752 946
753 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 947 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
754 if (!is_utf8_string (key, len)) 948 if (!is_utf8_string (key, len))
755 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 949 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
… …
760 } 954 }
761 955
762 SV *k = decode_sv (dec); 956 SV *k = decode_sv (dec);
763 SV *v = decode_sv (dec); 957 SV *v = decode_sv (dec);
764 958
959 // we leak memory if uncaught exceptions are thrown by random magical
960 // methods, and this is hopefully the only place where it can happen,
961 // so if there is a chance of an exception, take the very slow path.
962 // since catching exceptions is "undocumented/internal/forbidden" by
963 // the new p5p powers, we need to call out to a perl function :/
964 if (ecb_expect_false (SvAMAGIC (k)))
965 {
966 dSP;
967
968 ENTER; SAVETMPS;
969 PUSHMARK (SP);
970 EXTEND (SP, 3);
971 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
972 PUSHs (sv_2mortal (k));
973 PUSHs (sv_2mortal (v));
974
975 PUTBACK;
976 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
977 SPAGAIN;
978
979 FREETMPS; LEAVE;
980
981 if (SvTRUE (ERRSV))
982 ERR_ERRSV;
983
984 return;
985 }
986
765 hv_store_ent (hv, k, v, 0); 987 hv_store_ent (hv, k, v, 0);
766 SvREFCNT_dec (k); 988 SvREFCNT_dec_NN (k);
767 989
768fail: 990fail:
769 ; 991 ;
770} 992}
771 993
… …
782 1004
783 for (;;) 1005 for (;;)
784 { 1006 {
785 WANT (1); 1007 WANT (1);
786 1008
787 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) 1009 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
788 { 1010 {
789 ++dec->cur; 1011 ++dec->cur;
790 break; 1012 break;
791 } 1013 }
792 1014
793 decode_he (dec, hv); 1015 decode_he (dec, hv);
794 } 1016 }
795 } 1017 }
796 else 1018 else
797 { 1019 {
798 int pairs = decode_uint (dec); 1020 UV pairs = decode_uint (dec);
1021
1022 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
799 1023
800 while (pairs--) 1024 while (pairs--)
801 decode_he (dec, hv); 1025 decode_he (dec, hv);
802 } 1026 }
803 1027
804 DEC_DEC_DEPTH; 1028 DEC_DEC_DEPTH;
805 return newRV_noinc ((SV *)hv); 1029 return newRV_noinc ((SV *)hv);
806 1030
807fail: 1031fail:
808 SvREFCNT_dec (hv); 1032 SvREFCNT_dec_NN (hv);
809 DEC_DEC_DEPTH; 1033 DEC_DEC_DEPTH;
810 return &PL_sv_undef; 1034 return &PL_sv_undef;
811} 1035}
812 1036
813static SV * 1037static SV *
814decode_str (dec_t *dec, int utf8) 1038decode_str (dec_t *dec, int utf8)
815{ 1039{
816 SV *sv = 0; 1040 SV *sv = 0;
817 1041
818 if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) 1042 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
819 { 1043 {
820 // indefinite length strings 1044 // indefinite length strings
821 ++dec->cur; 1045 ++dec->cur;
822 1046
823 U8 major = *dec->cur & MAJOR_MISC; 1047 U8 major = *dec->cur & MAJOR_MISC;
… …
891 sv = newRV_noinc (decode_sv (dec)); 1115 sv = newRV_noinc (decode_sv (dec));
892 break; 1116 break;
893 1117
894 case CBOR_TAG_STRINGREF_NAMESPACE: 1118 case CBOR_TAG_STRINGREF_NAMESPACE:
895 { 1119 {
1120 // do not use SAVETMPS/FREETMPS, as these will
1121 // erase mortalised caches, e.g. "shareable"
896 ENTER; SAVETMPS; 1122 ENTER;
897 1123
898 SAVESPTR (dec->stringref); 1124 SAVESPTR (dec->stringref);
899 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1125 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
900 1126
901 sv = decode_sv (dec); 1127 sv = decode_sv (dec);
902 1128
903 FREETMPS; LEAVE; 1129 LEAVE;
904 } 1130 }
905 break; 1131 break;
906 1132
907 case CBOR_TAG_STRINGREF: 1133 case CBOR_TAG_STRINGREF:
908 { 1134 {
909 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1135 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
910 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1136 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
911 1137
912 UV idx = decode_uint (dec); 1138 UV idx = decode_uint (dec);
913 1139
914 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1140 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
915 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); 1141 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
916 1142
917 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1143 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
918 } 1144 }
919 break; 1145 break;
… …
947 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) 1173 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
948 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1174 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
949 1175
950 UV idx = decode_uint (dec); 1176 UV idx = decode_uint (dec);
951 1177
952 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1178 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
953 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1179 ERR ("corrupted CBOR data (sharedref index out of bounds)");
954 1180
955 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 1181 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
956 1182
957 if (sv == &PL_sv_undef) 1183 if (sv == &PL_sv_undef)
… …
959 } 1185 }
960 break; 1186 break;
961 1187
962 case CBOR_TAG_PERL_OBJECT: 1188 case CBOR_TAG_PERL_OBJECT:
963 { 1189 {
1190 if (dec->cbor.flags & F_FORBID_OBJECTS)
1191 goto filter;
1192
964 sv = decode_sv (dec); 1193 sv = decode_sv (dec);
965 1194
966 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1195 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
967 ERR ("corrupted CBOR data (non-array perl object)"); 1196 ERR ("corrupted CBOR data (non-array perl object)");
968 1197
… …
978 if (!method) 1207 if (!method)
979 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1208 ERR ("cannot decode perl-object (package does not have a THAW method)");
980 1209
981 dSP; 1210 dSP;
982 1211
983 ENTER; SAVETMPS; PUSHMARK (SP); 1212 ENTER; SAVETMPS;
1213 PUSHMARK (SP);
984 EXTEND (SP, len + 1); 1214 EXTEND (SP, len + 1);
985 // we re-bless the reference to get overload and other niceties right 1215 // we re-bless the reference to get overload and other niceties right
986 PUSHs (*av_fetch (av, 0, 1)); 1216 PUSHs (*av_fetch (av, 0, 1));
987 PUSHs (sv_cbor); 1217 PUSHs (sv_cbor);
988 1218
… …
996 SPAGAIN; 1226 SPAGAIN;
997 1227
998 if (SvTRUE (ERRSV)) 1228 if (SvTRUE (ERRSV))
999 { 1229 {
1000 FREETMPS; LEAVE; 1230 FREETMPS; LEAVE;
1001 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1231 ERR_ERRSV;
1002 } 1232 }
1003 1233
1004 SvREFCNT_dec (sv); 1234 SvREFCNT_dec_NN (sv);
1005 sv = SvREFCNT_inc (POPs); 1235 sv = SvREFCNT_inc (POPs);
1006 1236
1007 PUTBACK; 1237 PUTBACK;
1008 1238
1009 FREETMPS; LEAVE; 1239 FREETMPS; LEAVE;
1010 } 1240 }
1011 break; 1241 break;
1012 1242
1013 default: 1243 default:
1244 filter:
1014 { 1245 {
1246 SV *tag_sv = newSVuv (tag);
1247
1015 sv = decode_sv (dec); 1248 sv = decode_sv (dec);
1016 1249
1017 dSP; 1250 dSP;
1018 ENTER; SAVETMPS; PUSHMARK (SP); 1251 ENTER; SAVETMPS;
1252 PUSHMARK (SP);
1019 EXTEND (SP, 2); 1253 EXTEND (SP, 2);
1020 PUSHs (newSVuv (tag)); 1254 PUSHs (tag_sv);
1021 PUSHs (sv); 1255 PUSHs (sv);
1022 1256
1023 PUTBACK; 1257 PUTBACK;
1024 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); 1258 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1025 SPAGAIN; 1259 SPAGAIN;
1026 1260
1027 if (SvTRUE (ERRSV)) 1261 if (SvTRUE (ERRSV))
1028 { 1262 {
1263 SvREFCNT_dec_NN (tag_sv);
1029 FREETMPS; LEAVE; 1264 FREETMPS; LEAVE;
1030 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1265 ERR_ERRSV;
1031 } 1266 }
1032 1267
1033 if (count) 1268 if (count)
1034 { 1269 {
1270 SvREFCNT_dec_NN (tag_sv);
1035 SvREFCNT_dec (sv); 1271 SvREFCNT_dec_NN (sv);
1036 sv = SvREFCNT_inc (POPs); 1272 sv = SvREFCNT_inc_NN (TOPs);
1273 SP -= count;
1037 } 1274 }
1038 else 1275 else
1039 { 1276 {
1040 AV *av = newAV (); 1277 AV *av = newAV ();
1041 av_push (av, newSVuv (tag)); 1278 av_push (av, tag_sv);
1042 av_push (av, sv); 1279 av_push (av, sv);
1043 1280
1044 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1281 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1045 ? cbor_tagged_stash 1282 ? cbor_tagged_stash
1046 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1283 : gv_stashpv ("CBOR::XS::Tagged" , 1);
… …
1132 1369
1133 return newSVnv (ecb_binary64_to_double (fp)); 1370 return newSVnv (ecb_binary64_to_double (fp));
1134 } 1371 }
1135 1372
1136 // 0..19 unassigned simple 1373 // 0..19 unassigned simple
1137 // 24 reserved + unassigned (reserved values are not encodable) 1374 // 24 reserved + unassigned simple (reserved values are not encodable)
1375 // 28-30 unassigned misc
1376 // 31 break code
1138 default: 1377 default:
1139 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1378 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1140 } 1379 }
1141 1380
1142 break; 1381 break;
1143 } 1382 }
1144 1383
… …
1147} 1386}
1148 1387
1149static SV * 1388static SV *
1150decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1389decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1151{ 1390{
1152 dec_t dec = { }; 1391 dec_t dec = { 0 };
1153 SV *sv; 1392 SV *sv;
1154 STRLEN len; 1393 STRLEN len;
1155 char *data = SvPVbyte (string, len); 1394 char *data = SvPVbyte (string, len);
1156 1395
1157 if (len > cbor->max_size && cbor->max_size) 1396 if (len > cbor->max_size && cbor->max_size)
… …
1173 1412
1174 if (dec.err) 1413 if (dec.err)
1175 { 1414 {
1176 if (dec.shareable) 1415 if (dec.shareable)
1177 { 1416 {
1178 // need to break cyclic links, which whould all be in shareable 1417 // need to break cyclic links, which would all be in shareable
1179 int i; 1418 int i;
1180 SV **svp; 1419 SV **svp;
1181 1420
1182 for (i = av_len (dec.shareable) + 1; i--; ) 1421 for (i = av_len (dec.shareable) + 1; i--; )
1183 if ((svp = av_fetch (dec.shareable, i, 0))) 1422 if ((svp = av_fetch (dec.shareable, i, 0)))
1184 sv_setsv (*svp, &PL_sv_undef); 1423 sv_setsv (*svp, &PL_sv_undef);
1185 } 1424 }
1186 1425
1187 SvREFCNT_dec (sv); 1426 SvREFCNT_dec_NN (sv);
1427
1428 if (dec.err_sv)
1429 sv_2mortal (dec.err_sv);
1430
1188 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1431 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1189 } 1432 }
1190 1433
1191 sv = sv_2mortal (sv); 1434 sv = sv_2mortal (sv);
1192 1435
1193 return sv; 1436 return sv;
1194} 1437}
1195 1438
1439/////////////////////////////////////////////////////////////////////////////
1440// incremental parser
1441
1442#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
1443
1444// returns 0 for notyet, 1 for success or error
1445static int
1446incr_parse (CBOR *self, SV *cborstr)
1447{
1448 STRLEN cur;
1449 SvPV (cborstr, cur);
1450
1451 while (ecb_expect_true (self->incr_need <= cur))
1452 {
1453 // table of integer count bytes
1454 static I8 incr_len[MINOR_MASK + 1] = {
1455 0, 0, 0, 0, 0, 0, 0, 0,
1456 0, 0, 0, 0, 0, 0, 0, 0,
1457 0, 0, 0, 0, 0, 0, 0, 0,
1458 1, 2, 4, 8,-1,-1,-1,-2
1459 };
1460
1461 const U8 *p = SvPVX (cborstr) + self->incr_pos;
1462 U8 m = *p & MINOR_MASK;
1463 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1464 I8 ilen = incr_len[m];
1465
1466 self->incr_need = self->incr_pos + 1;
1467
1468 if (ecb_expect_false (ilen < 0))
1469 {
1470 if (m != MINOR_INDEF)
1471 return 1; // error
1472
1473 if (*p == (MAJOR_MISC | MINOR_INDEF))
1474 {
1475 if (count >= 0)
1476 return 1; // error
1477
1478 count = 1;
1479 }
1480 else
1481 {
1482 av_push (self->incr_count, newSViv (-1)); //TODO: nest
1483 count = -1;
1484 }
1485 }
1486 else
1487 {
1488 self->incr_need += ilen;
1489 if (ecb_expect_false (self->incr_need > cur))
1490 return 0;
1491
1492 int major = *p >> MAJOR_SHIFT;
1493
1494 switch (major)
1495 {
1496 case MAJOR_TAG >> MAJOR_SHIFT:
1497 ++count; // tags merely prefix another value
1498 break;
1499
1500 case MAJOR_BYTES >> MAJOR_SHIFT:
1501 case MAJOR_TEXT >> MAJOR_SHIFT:
1502 case MAJOR_ARRAY >> MAJOR_SHIFT:
1503 case MAJOR_MAP >> MAJOR_SHIFT:
1504 {
1505 UV len;
1506
1507 if (ecb_expect_false (ilen))
1508 {
1509 len = 0;
1510
1511 do {
1512 len = (len << 8) | *++p;
1513 } while (--ilen);
1514 }
1515 else
1516 len = m;
1517
1518 switch (major)
1519 {
1520 case MAJOR_BYTES >> MAJOR_SHIFT:
1521 case MAJOR_TEXT >> MAJOR_SHIFT:
1522 self->incr_need += len;
1523 if (ecb_expect_false (self->incr_need > cur))
1524 return 0;
1525
1526 break;
1527
1528 case MAJOR_MAP >> MAJOR_SHIFT:
1529 len <<= 1;
1530 case MAJOR_ARRAY >> MAJOR_SHIFT:
1531 if (len)
1532 {
1533 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1534 count = len + 1;
1535 }
1536 break;
1537 }
1538 }
1539 }
1540 }
1541
1542 self->incr_pos = self->incr_need;
1543
1544 if (count > 0)
1545 {
1546 while (!--count)
1547 {
1548 if (!AvFILLp (self->incr_count))
1549 return 1; // done
1550
1551 SvREFCNT_dec_NN (av_pop (self->incr_count));
1552 count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1553 }
1554
1555 SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
1556 }
1557 }
1558
1559 return 0;
1560}
1561
1562
1196///////////////////////////////////////////////////////////////////////////// 1563/////////////////////////////////////////////////////////////////////////////
1197// XS interface functions 1564// XS interface functions
1198 1565
1199MODULE = CBOR::XS PACKAGE = CBOR::XS 1566MODULE = CBOR::XS PACKAGE = CBOR::XS
1200 1567
… …
1212 1579
1213 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1580 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1214 1581
1215 sv_cbor = newSVpv ("CBOR", 0); 1582 sv_cbor = newSVpv ("CBOR", 0);
1216 SvREADONLY_on (sv_cbor); 1583 SvREADONLY_on (sv_cbor);
1584
1585 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1217} 1586}
1218 1587
1219PROTOTYPES: DISABLE 1588PROTOTYPES: DISABLE
1220 1589
1221void CLONE (...) 1590void CLONE (...)
… …
1241 ALIAS: 1610 ALIAS:
1242 shrink = F_SHRINK 1611 shrink = F_SHRINK
1243 allow_unknown = F_ALLOW_UNKNOWN 1612 allow_unknown = F_ALLOW_UNKNOWN
1244 allow_sharing = F_ALLOW_SHARING 1613 allow_sharing = F_ALLOW_SHARING
1245 allow_cycles = F_ALLOW_CYCLES 1614 allow_cycles = F_ALLOW_CYCLES
1615 forbid_objects = F_FORBID_OBJECTS
1246 pack_strings = F_PACK_STRINGS 1616 pack_strings = F_PACK_STRINGS
1617 text_keys = F_TEXT_KEYS
1618 text_strings = F_TEXT_STRINGS
1247 validate_utf8 = F_VALIDATE_UTF8 1619 validate_utf8 = F_VALIDATE_UTF8
1248 PPCODE: 1620 PPCODE:
1249{ 1621{
1250 if (enable) 1622 if (enable)
1251 self->flags |= ix; 1623 self->flags |= ix;
… …
1259 ALIAS: 1631 ALIAS:
1260 get_shrink = F_SHRINK 1632 get_shrink = F_SHRINK
1261 get_allow_unknown = F_ALLOW_UNKNOWN 1633 get_allow_unknown = F_ALLOW_UNKNOWN
1262 get_allow_sharing = F_ALLOW_SHARING 1634 get_allow_sharing = F_ALLOW_SHARING
1263 get_allow_cycles = F_ALLOW_CYCLES 1635 get_allow_cycles = F_ALLOW_CYCLES
1636 get_forbid_objects = F_FORBID_OBJECTS
1264 get_pack_strings = F_PACK_STRINGS 1637 get_pack_strings = F_PACK_STRINGS
1638 get_text_keys = F_TEXT_KEYS
1639 get_text_strings = F_TEXT_STRINGS
1265 get_validate_utf8 = F_VALIDATE_UTF8 1640 get_validate_utf8 = F_VALIDATE_UTF8
1266 PPCODE: 1641 PPCODE:
1267 XPUSHs (boolSV (self->flags & ix)); 1642 XPUSHs (boolSV (self->flags & ix));
1268 1643
1269void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1644void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
… …
1319 EXTEND (SP, 2); 1694 EXTEND (SP, 2);
1320 PUSHs (sv); 1695 PUSHs (sv);
1321 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1696 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1322} 1697}
1323 1698
1699void incr_parse (CBOR *self, SV *cborstr)
1700 ALIAS:
1701 incr_parse_multiple = 1
1702 PPCODE:
1703{
1704 if (SvUTF8 (cborstr))
1705 sv_utf8_downgrade (cborstr, 0);
1706
1707 if (!self->incr_count)
1708 {
1709 self->incr_count = newAV ();
1710 self->incr_pos = 0;
1711 self->incr_need = 1;
1712
1713 av_push (self->incr_count, newSViv (1));
1714 }
1715
1716 do
1717 {
1718 if (!incr_parse (self, cborstr))
1719 {
1720 if (self->incr_need > self->max_size && self->max_size)
1721 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1722 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1723
1724 break;
1725 }
1726
1727 SV *sv;
1728 char *offset;
1729
1730 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1731 XPUSHs (sv);
1732
1733 sv_chop (cborstr, offset);
1734
1735 av_clear (self->incr_count);
1736 av_push (self->incr_count, newSViv (1));
1737
1738 self->incr_pos = 0;
1739 self->incr_need = self->incr_pos + 1;
1740 }
1741 while (ix);
1742}
1743
1744void incr_reset (CBOR *self)
1745 CODE:
1746{
1747 SvREFCNT_dec (self->incr_count);
1748 self->incr_count = 0;
1749}
1750
1324void DESTROY (CBOR *self) 1751void DESTROY (CBOR *self)
1325 PPCODE: 1752 PPCODE:
1326 cbor_free (self); 1753 cbor_free (self);
1327 1754
1328PROTOTYPES: ENABLE 1755PROTOTYPES: ENABLE
… …
1347 cbor_init (&cbor); 1774 cbor_init (&cbor);
1348 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1775 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1349 XPUSHs (cborstr); 1776 XPUSHs (cborstr);
1350} 1777}
1351 1778
1779#ifdef __AFL_COMPILER
1780
1781void
1782afl_init ()
1783 CODE:
1784 __AFL_INIT ();
1785
1786int
1787afl_loop (unsigned int count = 10000)
1788 CODE:
1789 RETVAL = __AFL_LOOP (count);
1790 OUTPUT:
1791 RETVAL
1792
1793#endif
1794

Diff Legend

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