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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines