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.28 by root, Sat Nov 23 18:30:59 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
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
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};
69
28// known tags 70// known tags
29enum cbor_tag 71enum cbor_tag
30{ 72{
31 // inofficial extensions (pending iana registration) 73 // extensions
74 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
32 CBOR_TAG_PERL_OBJECT = 24, // http://cbor.schmorp.de/perl-object 75 CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
33 CBOR_TAG_GENERIC_OBJECT = 25, // http://cbor.schmorp.de/generic-object 76 CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
34 CBOR_TAG_VALUE_SHAREABLE = 26, // http://cbor.schmorp.de/value-sharing 77 CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
35 CBOR_TAG_VALUE_SHAREDREF = 27, // http://cbor.schmorp.de/value-sharing 78 CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
36 CBOR_TAG_STRINGREF_NAMESPACE = 65537, // http://cbor.schmorp.de/stringref 79 CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
37 CBOR_TAG_STRINGREF = 28, // http://cbor.schmorp.de/stringref
38 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection 80 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
39 81
40 // rfc7049 82 // rfc7049
41 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8 83 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
42 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any 84 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
43 CBOR_TAG_POS_BIGNUM = 2, // byte string 85 CBOR_TAG_POS_BIGNUM = 2, // byte string
44 CBOR_TAG_NEG_BIGNUM = 3, // byte string 86 CBOR_TAG_NEG_BIGNUM = 3, // byte string
45 CBOR_TAG_DECIMAL = 4, // decimal fraction, array 87 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
46 CBOR_TAG_BIGFLOAT = 5, // array 88 CBOR_TAG_BIGFLOAT = 5, // array
47 89
48 CBOR_TAG_CONV_B64U = 21, // base64url, any 90 CBOR_TAG_CONV_B64U = 21, // base64url, any
49 CBOR_TAG_CONV_B64 = 22, // base64, any 91 CBOR_TAG_CONV_B64 = 22, // base64, any
50 CBOR_TAG_CONV_HEX = 23, // base16, any 92 CBOR_TAG_CONV_HEX = 23, // base16, any
51 CBOR_TAG_CBOR = 24, // embedded cbor, byte string 93 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
52 94
53 CBOR_TAG_URI = 32, // URI rfc3986, utf-8 95 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
54 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8 96 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
55 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8 97 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
56 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8 98 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
57 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
58 100
59 CBOR_TAG_MAGIC = 55799 // self-describe cbor 101 CBOR_TAG_MAGIC = 55799, // self-describe cbor
60}; 102};
61 103
62#define F_SHRINK 0x00000001UL 104#define F_SHRINK 0x00000001UL
63#define F_ALLOW_UNKNOWN 0x00000002UL 105#define F_ALLOW_UNKNOWN 0x00000002UL
64#define F_ALLOW_SHARING 0x00000004UL //TODO 106#define F_ALLOW_SHARING 0x00000004UL
65#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
66 113
67#define INIT_SIZE 32 // initial scalar size to be allocated 114#define INIT_SIZE 32 // initial scalar size to be allocated
68 115
69#define SB do { 116#define SB do {
70#define SE } while (0) 117#define SE } while (0)
89typedef struct { 136typedef struct {
90 U32 flags; 137 U32 flags;
91 U32 max_depth; 138 U32 max_depth;
92 STRLEN max_size; 139 STRLEN max_size;
93 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.
94} CBOR; 146} CBOR;
95 147
96ecb_inline void 148ecb_inline void
97cbor_init (CBOR *cbor) 149cbor_init (CBOR *cbor)
98{ 150{
102 154
103ecb_inline void 155ecb_inline void
104cbor_free (CBOR *cbor) 156cbor_free (CBOR *cbor)
105{ 157{
106 SvREFCNT_dec (cbor->filter); 158 SvREFCNT_dec (cbor->filter);
159 SvREFCNT_dec (cbor->incr_count);
107} 160}
108 161
109///////////////////////////////////////////////////////////////////////////// 162/////////////////////////////////////////////////////////////////////////////
110// utility functions 163// utility functions
111 164
137 190
138// minimum length of a string to be registered for stringref 191// minimum length of a string to be registered for stringref
139ecb_inline int 192ecb_inline int
140minimum_string_length (UV idx) 193minimum_string_length (UV idx)
141{ 194{
142 return idx > 23 195 return idx <= 23 ? 3
143 ? idx > 0xffU 196 : idx <= 0xffU ? 4
144 ? idx > 0xffffU 197 : idx <= 0xffffU ? 5
145 ? idx > 0xffffffffU 198 : idx <= 0xffffffffU ? 7
146 ? 7 199 : 11;
147 : 6
148 : 5
149 : 4
150 : 3;
151} 200}
152 201
153///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
154// encoder 203// encoder
155 204
168} enc_t; 217} enc_t;
169 218
170ecb_inline void 219ecb_inline void
171need (enc_t *enc, STRLEN len) 220need (enc_t *enc, STRLEN len)
172{ 221{
173 if (ecb_expect_false (enc->cur + len >= enc->end)) 222 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
174 { 223 {
175 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 224 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
176 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 225 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
177 enc->cur = SvPVX (enc->sv) + cur; 226 enc->cur = SvPVX (enc->sv) + cur;
178 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
189static void 238static void
190encode_uint (enc_t *enc, int major, UV len) 239encode_uint (enc_t *enc, int major, UV len)
191{ 240{
192 need (enc, 9); 241 need (enc, 9);
193 242
194 if (len < 24) 243 if (ecb_expect_true (len < LENGTH_EXT1))
195 *enc->cur++ = major | len; 244 *enc->cur++ = major | len;
196 else if (len <= 0xff) 245 else if (ecb_expect_true (len <= 0xffU))
197 { 246 {
198 *enc->cur++ = major | 24; 247 *enc->cur++ = major | LENGTH_EXT1;
199 *enc->cur++ = len; 248 *enc->cur++ = len;
200 } 249 }
201 else if (len <= 0xffff) 250 else if (len <= 0xffffU)
202 { 251 {
203 *enc->cur++ = major | 25; 252 *enc->cur++ = major | LENGTH_EXT2;
204 *enc->cur++ = len >> 8; 253 *enc->cur++ = len >> 8;
205 *enc->cur++ = len; 254 *enc->cur++ = len;
206 } 255 }
207 else if (len <= 0xffffffff) 256 else if (len <= 0xffffffffU)
208 { 257 {
209 *enc->cur++ = major | 26; 258 *enc->cur++ = major | LENGTH_EXT4;
210 *enc->cur++ = len >> 24; 259 *enc->cur++ = len >> 24;
211 *enc->cur++ = len >> 16; 260 *enc->cur++ = len >> 16;
212 *enc->cur++ = len >> 8; 261 *enc->cur++ = len >> 8;
213 *enc->cur++ = len; 262 *enc->cur++ = len;
214 } 263 }
215 else 264 else
216 { 265 {
217 *enc->cur++ = major | 27; 266 *enc->cur++ = major | LENGTH_EXT8;
218 *enc->cur++ = len >> 56; 267 *enc->cur++ = len >> 56;
219 *enc->cur++ = len >> 48; 268 *enc->cur++ = len >> 48;
220 *enc->cur++ = len >> 40; 269 *enc->cur++ = len >> 40;
221 *enc->cur++ = len >> 32; 270 *enc->cur++ = len >> 32;
222 *enc->cur++ = len >> 24; 271 *enc->cur++ = len >> 24;
227} 276}
228 277
229ecb_inline void 278ecb_inline void
230encode_tag (enc_t *enc, UV tag) 279encode_tag (enc_t *enc, UV tag)
231{ 280{
232 encode_uint (enc, 0xc0, tag); 281 encode_uint (enc, MAJOR_TAG, tag);
233} 282}
234 283
235static void 284// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
285ecb_noinline static void
236encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 286encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
237{ 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{
238 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_STRINGREF)) 326 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
239 { 327 {
240 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 328 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
241 329
242 if (SvOK (*svp)) 330 if (SvOK (*svp))
243 { 331 {
244 // already registered, use stringref 332 // already registered, use stringref
245 encode_tag (enc, CBOR_TAG_STRINGREF); 333 encode_tag (enc, CBOR_TAG_STRINGREF);
246 encode_uint (enc, 0x00, SvUV (*svp)); 334 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
247 return; 335 return;
248 } 336 }
249 else if (len >= minimum_string_length (enc->stringref_idx)) 337 else if (len >= minimum_string_length (enc->stringref_idx))
250 { 338 {
251 // register only 339 // register only
252 sv_setuv (*svp, enc->stringref_idx); 340 sv_setuv (*svp, enc->stringref_idx);
253 ++enc->stringref_idx; 341 ++enc->stringref_idx;
254 } 342 }
255 } 343 }
256 344
257 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 345 encode_str (enc, upgrade_utf8, utf8, str, len);
258 need (enc, len);
259 memcpy (enc->cur, str, len);
260 enc->cur += len;
261} 346}
262 347
263static void encode_sv (enc_t *enc, SV *sv); 348static void encode_sv (enc_t *enc, SV *sv);
264 349
265static void 350static void
270 if (enc->depth >= enc->cbor.max_depth) 355 if (enc->depth >= enc->cbor.max_depth)
271 croak (ERR_NESTING_EXCEEDED); 356 croak (ERR_NESTING_EXCEEDED);
272 357
273 ++enc->depth; 358 ++enc->depth;
274 359
275 encode_uint (enc, 0x80, len + 1); 360 encode_uint (enc, MAJOR_ARRAY, len + 1);
276 361
362 if (ecb_expect_false (SvMAGICAL (av)))
277 for (i = 0; i <= len; ++i) 363 for (i = 0; i <= len; ++i)
278 { 364 {
279 SV **svp = av_fetch (av, i, 0); 365 SV **svp = av_fetch (av, i, 0);
280 encode_sv (enc, svp ? *svp : &PL_sv_undef); 366 encode_sv (enc, svp ? *svp : &PL_sv_undef);
281 } 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 }
282 374
283 --enc->depth; 375 --enc->depth;
284} 376}
285 377
286static void 378static void
294 ++enc->depth; 386 ++enc->depth;
295 387
296 int pairs = hv_iterinit (hv); 388 int pairs = hv_iterinit (hv);
297 int mg = SvMAGICAL (hv); 389 int mg = SvMAGICAL (hv);
298 390
299 if (mg) 391 if (ecb_expect_false (mg))
300 encode_ch (enc, 0xa0 | 31); 392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
301 else 393 else
302 encode_uint (enc, 0xa0, pairs); 394 encode_uint (enc, MAJOR_MAP, pairs);
303 395
304 while ((he = hv_iternext (hv))) 396 while ((he = hv_iternext (hv)))
305 { 397 {
306 if (HeKLEN (he) == HEf_SVKEY) 398 if (HeKLEN (he) == HEf_SVKEY)
307 encode_sv (enc, HeSVKEY (he)); 399 encode_sv (enc, HeSVKEY (he));
308 else 400 else
309 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));
310 402
311 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));
312 } 404 }
313 405
314 if (mg) 406 if (ecb_expect_false (mg))
315 encode_ch (enc, 0xe0 | 31); 407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
316 408
317 --enc->depth; 409 --enc->depth;
318} 410}
319 411
320// encode objects, arrays and special \0=false and \1=true values. 412// encode objects, arrays and special \0=false and \1=true values.
321static void 413static void
322encode_rv (enc_t *enc, SV *sv) 414encode_rv (enc_t *enc, SV *sv)
323{ 415{
324 SvGETMAGIC (sv); 416 SvGETMAGIC (sv);
325
326 if (ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)
327 && ecb_expect_false (SvREFCNT (sv) > 1))
328 {
329 if (!enc->shareable)
330 enc->shareable = (HV *)sv_2mortal ((SV *)newHV ());
331
332 SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1);
333
334 if (SvOK (*svp))
335 {
336 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
337 encode_uint (enc, 0x00, SvUV (*svp));
338 return;
339 }
340 else
341 {
342 sv_setuv (*svp, enc->shareable_idx);
343 ++enc->shareable_idx;
344 encode_tag (enc, CBOR_TAG_VALUE_SHAREABLE);
345 }
346 }
347 417
348 svtype svt = SvTYPE (sv); 418 svtype svt = SvTYPE (sv);
349 419
350 if (ecb_expect_false (SvOBJECT (sv))) 420 if (ecb_expect_false (SvOBJECT (sv)))
351 { 421 {
358 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 428 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
359 ? cbor_tagged_stash 429 ? cbor_tagged_stash
360 : gv_stashpv ("CBOR::XS::Tagged" , 1); 430 : gv_stashpv ("CBOR::XS::Tagged" , 1);
361 431
362 HV *stash = SvSTASH (sv); 432 HV *stash = SvSTASH (sv);
363 GV *method;
364 433
365 if (stash == boolean_stash) 434 if (stash == boolean_stash)
366 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 }
367 else if (stash == error_stash) 439 else if (stash == error_stash)
368 encode_ch (enc, 0xe0 | 23); 440 {
441 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
442 return;
443 }
369 else if (stash == tagged_stash) 444 else if (stash == tagged_stash)
370 { 445 {
371 if (svt != SVt_PVAV) 446 if (svt != SVt_PVAV)
372 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 447 croak ("encountered CBOR::XS::Tagged object that isn't an array");
373 448
374 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 449 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
375 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))
376 } 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))));
377 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 486 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
378 { 487 {
379 dSP; 488 dSP;
380 489
381 ENTER; SAVETMPS; PUSHMARK (SP); 490 ENTER; SAVETMPS;
491 PUSHMARK (SP);
382 // 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
383 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 493 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
384 494
385 PUTBACK; 495 PUTBACK;
386 // G_SCALAR ensures that return value is 1 496 // G_SCALAR ensures that return value is 1
399 } 509 }
400 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
401 { 511 {
402 dSP; 512 dSP;
403 513
404 ENTER; SAVETMPS; PUSHMARK (SP); 514 ENTER; SAVETMPS;
515 PUSHMARK (SP);
405 EXTEND (SP, 2); 516 EXTEND (SP, 2);
406 // 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
407 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 518 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
408 PUSHs (sv_cbor); 519 PUSHs (sv_cbor);
409 520
414 // catch this surprisingly common error 525 // catch this surprisingly common error
415 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 526 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
416 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));
417 528
418 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 529 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
419 encode_uint (enc, 0x80, count + 1); 530 encode_uint (enc, MAJOR_ARRAY, count + 1);
420 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 531 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
421 532
422 while (count) 533 {
534 int i;
535
536 for (i = 0; i < count; ++i)
423 encode_sv (enc, SP[1 - count--]); 537 encode_sv (enc, SP[i + 1 - count]);
538
539 SP -= count;
540 }
424 541
425 PUTBACK; 542 PUTBACK;
426 543
427 FREETMPS; LEAVE; 544 FREETMPS; LEAVE;
428 } 545 }
446{ 563{
447 double nv = SvNVX (sv); 564 double nv = SvNVX (sv);
448 565
449 need (enc, 9); 566 need (enc, 9);
450 567
451 if (ecb_expect_false (nv == (U32)nv)) 568 if (ecb_expect_false (nv == (NV)(U32)nv))
452 encode_uint (enc, 0x00, (U32)nv); 569 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
453 //TODO: maybe I32? 570 //TODO: maybe I32?
454 else if (ecb_expect_false (nv == (float)nv)) 571 else if (ecb_expect_false (nv == (float)nv))
455 { 572 {
573 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
574
456 uint32_t fp = ecb_float_to_binary32 (nv); 575 uint32_t fp = ecb_float_to_binary32 (nv);
457
458 *enc->cur++ = 0xe0 | 26;
459 576
460 if (!ecb_big_endian ()) 577 if (!ecb_big_endian ())
461 fp = ecb_bswap32 (fp); 578 fp = ecb_bswap32 (fp);
462 579
463 memcpy (enc->cur, &fp, 4); 580 memcpy (enc->cur, &fp, 4);
464 enc->cur += 4; 581 enc->cur += 4;
465 } 582 }
466 else 583 else
467 { 584 {
585 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
586
468 uint64_t fp = ecb_double_to_binary64 (nv); 587 uint64_t fp = ecb_double_to_binary64 (nv);
469
470 *enc->cur++ = 0xe0 | 27;
471 588
472 if (!ecb_big_endian ()) 589 if (!ecb_big_endian ())
473 fp = ecb_bswap64 (fp); 590 fp = ecb_bswap64 (fp);
474 591
475 memcpy (enc->cur, &fp, 8); 592 memcpy (enc->cur, &fp, 8);
484 601
485 if (SvPOKp (sv)) 602 if (SvPOKp (sv))
486 { 603 {
487 STRLEN len; 604 STRLEN len;
488 char *str = SvPV (sv, len); 605 char *str = SvPV (sv, len);
489 encode_str (enc, SvUTF8 (sv), str, len); 606 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
490 } 607 }
491 else if (SvNOKp (sv)) 608 else if (SvNOKp (sv))
492 encode_nv (enc, sv); 609 encode_nv (enc, sv);
493 else if (SvIOKp (sv)) 610 else if (SvIOKp (sv))
494 { 611 {
495 if (SvIsUV (sv)) 612 if (SvIsUV (sv))
496 encode_uint (enc, 0x00, SvUVX (sv)); 613 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
497 else if (SvIVX (sv) >= 0) 614 else if (SvIVX (sv) >= 0)
498 encode_uint (enc, 0x00, SvIVX (sv)); 615 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
499 else 616 else
500 encode_uint (enc, 0x20, -(SvIVX (sv) + 1)); 617 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
501 } 618 }
502 else if (SvROK (sv)) 619 else if (SvROK (sv))
503 encode_rv (enc, SvRV (sv)); 620 encode_rv (enc, SvRV (sv));
504 else if (!SvOK (sv)) 621 else if (!SvOK (sv))
505 encode_ch (enc, 0xe0 | 22); 622 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
506 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 623 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
507 encode_ch (enc, 0xe0 | 23); 624 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
508 else 625 else
509 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",
510 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 627 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
511} 628}
512 629
513static SV * 630static SV *
514encode_cbor (SV *scalar, CBOR *cbor) 631encode_cbor (SV *scalar, CBOR *cbor)
515{ 632{
516 enc_t enc = { }; 633 enc_t enc = { 0 };
517 634
518 enc.cbor = *cbor; 635 enc.cbor = *cbor;
519 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 636 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
520 enc.cur = SvPVX (enc.sv); 637 enc.cur = SvPVX (enc.sv);
521 enc.end = SvEND (enc.sv); 638 enc.end = SvEND (enc.sv);
522 639
523 SvPOK_only (enc.sv); 640 SvPOK_only (enc.sv);
524 641
525 if (cbor->flags & F_ALLOW_STRINGREF) 642 if (cbor->flags & F_PACK_STRINGS)
526 { 643 {
527 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE); 644 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
528 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ()); 645 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
529 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ()); 646 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
530 } 647 }
553 U32 depth; // recursion depth 670 U32 depth; // recursion depth
554 U32 maxdepth; // recursion depth limit 671 U32 maxdepth; // recursion depth limit
555 AV *shareable; 672 AV *shareable;
556 AV *stringref; 673 AV *stringref;
557 SV *decode_tagged; 674 SV *decode_tagged;
675 SV *err_sv; // optional sv for error, needs to be freed
558} dec_t; 676} dec_t;
559 677
560#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);
561 685
562#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;
563 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
564#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)
565#define DEC_DEC_DEPTH --dec->depth 715#define DEC_DEC_DEPTH --dec->depth
566 716
567static UV 717static UV
568decode_uint (dec_t *dec) 718decode_uint (dec_t *dec)
569{ 719{
570 switch (*dec->cur & 31) 720 U8 m = *dec->cur & MINOR_MASK;
571 { 721 ++dec->cur;
572 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
573 case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
574 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
575 return *dec->cur++ & 31;
576 722
577 case 24: 723 if (ecb_expect_true (m < LENGTH_EXT1))
724 return m;
725 else if (ecb_expect_true (m == LENGTH_EXT1))
726 {
578 WANT (2); 727 WANT (1);
579 dec->cur += 2; 728 dec->cur += 1;
580 return dec->cur[-1]; 729 return dec->cur[-1];
581 730 }
582 case 25: 731 else if (ecb_expect_true (m == LENGTH_EXT2))
732 {
583 WANT (3); 733 WANT (2);
584 dec->cur += 3; 734 dec->cur += 2;
585 return (((UV)dec->cur[-2]) << 8) 735 return (((UV)dec->cur[-2]) << 8)
586 | ((UV)dec->cur[-1]); 736 | ((UV)dec->cur[-1]);
587 737 }
588 case 26: 738 else if (ecb_expect_true (m == LENGTH_EXT4))
739 {
589 WANT (5); 740 WANT (4);
590 dec->cur += 5; 741 dec->cur += 4;
591 return (((UV)dec->cur[-4]) << 24) 742 return (((UV)dec->cur[-4]) << 24)
592 | (((UV)dec->cur[-3]) << 16) 743 | (((UV)dec->cur[-3]) << 16)
593 | (((UV)dec->cur[-2]) << 8) 744 | (((UV)dec->cur[-2]) << 8)
594 | ((UV)dec->cur[-1]); 745 | ((UV)dec->cur[-1]);
595 746 }
596 case 27: 747 else if (ecb_expect_true (m == LENGTH_EXT8))
748 {
597 WANT (9); 749 WANT (8);
598 dec->cur += 9; 750 dec->cur += 8;
751
752 return
753#if UVSIZE < 8
754 0
755#else
599 return (((UV)dec->cur[-8]) << 56) 756 (((UV)dec->cur[-8]) << 56)
600 | (((UV)dec->cur[-7]) << 48) 757 | (((UV)dec->cur[-7]) << 48)
601 | (((UV)dec->cur[-6]) << 40) 758 | (((UV)dec->cur[-6]) << 40)
602 | (((UV)dec->cur[-5]) << 32) 759 | (((UV)dec->cur[-5]) << 32)
760#endif
603 | (((UV)dec->cur[-4]) << 24) 761 | (((UV)dec->cur[-4]) << 24)
604 | (((UV)dec->cur[-3]) << 16) 762 | (((UV)dec->cur[-3]) << 16)
605 | (((UV)dec->cur[-2]) << 8) 763 | (((UV)dec->cur[-2]) << 8)
606 | ((UV)dec->cur[-1]); 764 | ((UV)dec->cur[-1]);
607 765 }
608 default: 766 else
609 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 767 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
610 }
611 768
612fail: 769fail:
613 return 0; 770 return 0;
614} 771}
615 772
620{ 777{
621 AV *av = newAV (); 778 AV *av = newAV ();
622 779
623 DEC_INC_DEPTH; 780 DEC_INC_DEPTH;
624 781
625 if ((*dec->cur & 31) == 31) 782 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
626 { 783 {
627 ++dec->cur; 784 ++dec->cur;
628 785
629 for (;;) 786 for (;;)
630 { 787 {
631 WANT (1); 788 WANT (1);
632 789
633 if (*dec->cur == (0xe0 | 31)) 790 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
634 { 791 {
635 ++dec->cur; 792 ++dec->cur;
636 break; 793 break;
637 } 794 }
638 795
639 av_push (av, decode_sv (dec)); 796 av_push (av, decode_sv (dec));
640 } 797 }
641 } 798 }
642 else 799 else
643 { 800 {
644 int i, len = decode_uint (dec); 801 UV i, len = decode_uint (dec);
645 802
803 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
646 av_fill (av, len - 1); 804 av_fill (av, len - 1);
647 805
648 for (i = 0; i < len; ++i) 806 for (i = 0; i < len; ++i)
649 AvARRAY (av)[i] = decode_sv (dec); 807 AvARRAY (av)[i] = decode_sv (dec);
650 } 808 }
651 809
652 DEC_DEC_DEPTH; 810 DEC_DEC_DEPTH;
653 return newRV_noinc ((SV *)av); 811 return newRV_noinc ((SV *)av);
654 812
655fail: 813fail:
656 SvREFCNT_dec (av); 814 SvREFCNT_dec_NN (av);
657 DEC_DEC_DEPTH; 815 DEC_DEC_DEPTH;
658 return &PL_sv_undef; 816 return &PL_sv_undef;
659} 817}
660 818
661static void 819static void
663{ 821{
664 // for speed reasons, we specialcase single-string 822 // for speed reasons, we specialcase single-string
665 // byte or utf-8 strings as keys, but only when !stringref 823 // byte or utf-8 strings as keys, but only when !stringref
666 824
667 if (ecb_expect_true (!dec->stringref)) 825 if (ecb_expect_true (!dec->stringref))
668 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27) 826 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
669 { 827 {
670 I32 len = decode_uint (dec); 828 STRLEN len = decode_uint (dec);
671 char *key = (char *)dec->cur; 829 char *key = (char *)dec->cur;
672 830
831 WANT (len);
673 dec->cur += len; 832 dec->cur += len;
674 833
675 if (ecb_expect_false (dec->stringref))
676 av_push (dec->stringref, newSVpvn (key, len));
677
678 hv_store (hv, key, len, decode_sv (dec), 0); 834 hv_store (hv, key, len, decode_sv (dec), 0);
679 835
680 return; 836 return;
681 } 837 }
682 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27) 838 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
683 { 839 {
684 I32 len = decode_uint (dec); 840 STRLEN len = decode_uint (dec);
685 char *key = (char *)dec->cur; 841 char *key = (char *)dec->cur;
686 842
843 WANT (len);
687 dec->cur += len; 844 dec->cur += len;
688 845
689 if (ecb_expect_false (dec->stringref)) 846 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
690 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)");
691 849
692 hv_store (hv, key, -len, decode_sv (dec), 0); 850 hv_store (hv, key, -len, decode_sv (dec), 0);
693 851
694 return; 852 return;
695 } 853 }
696 854
697 SV *k = decode_sv (dec); 855 SV *k = decode_sv (dec);
698 SV *v = decode_sv (dec); 856 SV *v = decode_sv (dec);
699 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
700 hv_store_ent (hv, k, v, 0); 886 hv_store_ent (hv, k, v, 0);
701 SvREFCNT_dec (k); 887 SvREFCNT_dec_NN (k);
888
889fail:
890 ;
702} 891}
703 892
704static SV * 893static SV *
705decode_hv (dec_t *dec) 894decode_hv (dec_t *dec)
706{ 895{
707 HV *hv = newHV (); 896 HV *hv = newHV ();
708 897
709 DEC_INC_DEPTH; 898 DEC_INC_DEPTH;
710 899
711 if ((*dec->cur & 31) == 31) 900 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
712 { 901 {
713 ++dec->cur; 902 ++dec->cur;
714 903
715 for (;;) 904 for (;;)
716 { 905 {
717 WANT (1); 906 WANT (1);
718 907
719 if (*dec->cur == (0xe0 | 31)) 908 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
720 { 909 {
721 ++dec->cur; 910 ++dec->cur;
722 break; 911 break;
723 } 912 }
724 913
725 decode_he (dec, hv); 914 decode_he (dec, hv);
726 } 915 }
727 } 916 }
728 else 917 else
729 { 918 {
730 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
731 922
732 while (pairs--) 923 while (pairs--)
733 decode_he (dec, hv); 924 decode_he (dec, hv);
734 } 925 }
735 926
736 DEC_DEC_DEPTH; 927 DEC_DEC_DEPTH;
737 return newRV_noinc ((SV *)hv); 928 return newRV_noinc ((SV *)hv);
738 929
739fail: 930fail:
740 SvREFCNT_dec (hv); 931 SvREFCNT_dec_NN (hv);
741 DEC_DEC_DEPTH; 932 DEC_DEC_DEPTH;
742 return &PL_sv_undef; 933 return &PL_sv_undef;
743} 934}
744 935
745static SV * 936static SV *
746decode_str (dec_t *dec, int utf8) 937decode_str (dec_t *dec, int utf8)
747{ 938{
748 SV *sv = 0; 939 SV *sv = 0;
749 940
750 if ((*dec->cur & 31) == 31) 941 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
751 { 942 {
943 // indefinite length strings
752 ++dec->cur; 944 ++dec->cur;
753 945
946 U8 major = *dec->cur & MAJOR_MISC;
947
754 sv = newSVpvn ("", 0); 948 sv = newSVpvn ("", 0);
755 949
756 // not very fast, and certainly not robust against illegal input
757 for (;;) 950 for (;;)
758 { 951 {
759 WANT (1); 952 WANT (1);
760 953
761 if (*dec->cur == (0xe0 | 31)) 954 if ((*dec->cur - major) > LENGTH_EXT8)
955 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
762 { 956 {
763 ++dec->cur; 957 ++dec->cur;
764 break; 958 break;
765 } 959 }
960 else
961 ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
766 962
767 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;
768 } 968 }
769 } 969 }
770 else 970 else
771 { 971 {
772 STRLEN len = decode_uint (dec); 972 STRLEN len = decode_uint (dec);
779 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1)) 979 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
780 av_push (dec->stringref, SvREFCNT_inc_NN (sv)); 980 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
781 } 981 }
782 982
783 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
784 SvUTF8_on (sv); 989 SvUTF8_on (sv);
990 }
785 991
786 return sv; 992 return sv;
787 993
788fail: 994fail:
789 SvREFCNT_dec (sv); 995 SvREFCNT_dec (sv);
808 sv = newRV_noinc (decode_sv (dec)); 1014 sv = newRV_noinc (decode_sv (dec));
809 break; 1015 break;
810 1016
811 case CBOR_TAG_STRINGREF_NAMESPACE: 1017 case CBOR_TAG_STRINGREF_NAMESPACE:
812 { 1018 {
1019 // do not use SAVETMPS/FREETMPS, as these will
1020 // erase mortalised caches, e.g. "shareable"
813 ENTER; SAVETMPS; 1021 ENTER;
814 1022
815 SAVESPTR (dec->stringref); 1023 SAVESPTR (dec->stringref);
816 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 1024 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
817 1025
818 sv = decode_sv (dec); 1026 sv = decode_sv (dec);
819 1027
820 FREETMPS; LEAVE; 1028 LEAVE;
821 } 1029 }
822 break; 1030 break;
823 1031
824 case CBOR_TAG_STRINGREF: 1032 case CBOR_TAG_STRINGREF:
825 { 1033 {
826 if ((*dec->cur >> 5) != 0) 1034 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
827 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 1035 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
828 1036
829 UV idx = decode_uint (dec); 1037 UV idx = decode_uint (dec);
830 1038
831 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 1039 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
832 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)");
833 1041
834 sv = newSVsv (AvARRAY (dec->stringref)[idx]); 1042 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
835 } 1043 }
836 break; 1044 break;
838 case CBOR_TAG_VALUE_SHAREABLE: 1046 case CBOR_TAG_VALUE_SHAREABLE:
839 { 1047 {
840 if (ecb_expect_false (!dec->shareable)) 1048 if (ecb_expect_false (!dec->shareable))
841 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ()); 1049 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
842 1050
1051 if (dec->cbor.flags & F_ALLOW_CYCLES)
1052 {
843 sv = newSV (0); 1053 sv = newSV (0);
844 av_push (dec->shareable, SvREFCNT_inc_NN (sv)); 1054 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
845 1055
846 SV *osv = decode_sv (dec); 1056 SV *osv = decode_sv (dec);
847 sv_setsv (sv, osv); 1057 sv_setsv (sv, osv);
848 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 }
849 } 1067 }
850 break; 1068 break;
851 1069
852 case CBOR_TAG_VALUE_SHAREDREF: 1070 case CBOR_TAG_VALUE_SHAREDREF:
853 { 1071 {
854 if ((*dec->cur >> 5) != 0) 1072 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
855 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 1073 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
856 1074
857 UV idx = decode_uint (dec); 1075 UV idx = decode_uint (dec);
858 1076
859 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 1077 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
860 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 1078 ERR ("corrupted CBOR data (sharedref index out of bounds)");
861 1079
862 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");
863 } 1084 }
864 break; 1085 break;
865 1086
866 case CBOR_TAG_PERL_OBJECT: 1087 case CBOR_TAG_PERL_OBJECT:
867 { 1088 {
1089 if (dec->cbor.flags & F_FORBID_OBJECTS)
1090 goto filter;
1091
868 sv = decode_sv (dec); 1092 sv = decode_sv (dec);
869 1093
870 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) 1094 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
871 ERR ("corrupted CBOR data (non-array perl object)"); 1095 ERR ("corrupted CBOR data (non-array perl object)");
872 1096
882 if (!method) 1106 if (!method)
883 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)");
884 1108
885 dSP; 1109 dSP;
886 1110
887 ENTER; SAVETMPS; PUSHMARK (SP); 1111 ENTER; SAVETMPS;
1112 PUSHMARK (SP);
888 EXTEND (SP, len + 1); 1113 EXTEND (SP, len + 1);
889 // 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
890 PUSHs (*av_fetch (av, 0, 1)); 1115 PUSHs (*av_fetch (av, 0, 1));
891 PUSHs (sv_cbor); 1116 PUSHs (sv_cbor);
892 1117
900 SPAGAIN; 1125 SPAGAIN;
901 1126
902 if (SvTRUE (ERRSV)) 1127 if (SvTRUE (ERRSV))
903 { 1128 {
904 FREETMPS; LEAVE; 1129 FREETMPS; LEAVE;
905 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1130 ERR_ERRSV;
906 } 1131 }
907 1132
908 SvREFCNT_dec (sv); 1133 SvREFCNT_dec_NN (sv);
909 sv = SvREFCNT_inc (POPs); 1134 sv = SvREFCNT_inc (POPs);
910 1135
911 PUTBACK; 1136 PUTBACK;
912 1137
913 FREETMPS; LEAVE; 1138 FREETMPS; LEAVE;
914 } 1139 }
915 break; 1140 break;
916 1141
917 default: 1142 default:
1143 filter:
918 { 1144 {
1145 SV *tag_sv = newSVuv (tag);
1146
919 sv = decode_sv (dec); 1147 sv = decode_sv (dec);
920 1148
921 dSP; 1149 dSP;
922 ENTER; SAVETMPS; PUSHMARK (SP); 1150 ENTER; SAVETMPS;
1151 PUSHMARK (SP);
923 EXTEND (SP, 2); 1152 EXTEND (SP, 2);
924 PUSHs (newSVuv (tag)); 1153 PUSHs (tag_sv);
925 PUSHs (sv); 1154 PUSHs (sv);
926 1155
927 PUTBACK; 1156 PUTBACK;
928 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);
929 SPAGAIN; 1158 SPAGAIN;
930 1159
931 if (SvTRUE (ERRSV)) 1160 if (SvTRUE (ERRSV))
932 { 1161 {
1162 SvREFCNT_dec_NN (tag_sv);
933 FREETMPS; LEAVE; 1163 FREETMPS; LEAVE;
934 ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); 1164 ERR_ERRSV;
935 } 1165 }
936 1166
937 if (count) 1167 if (count)
938 { 1168 {
1169 SvREFCNT_dec_NN (tag_sv);
939 SvREFCNT_dec (sv); 1170 SvREFCNT_dec_NN (sv);
940 sv = SvREFCNT_inc (POPs); 1171 sv = SvREFCNT_inc_NN (TOPs);
1172 SP -= count;
941 } 1173 }
942 else 1174 else
943 { 1175 {
944 AV *av = newAV (); 1176 AV *av = newAV ();
945 av_push (av, newSVuv (tag)); 1177 av_push (av, tag_sv);
946 av_push (av, sv); 1178 av_push (av, sv);
947 1179
948 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1180 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
949 ? cbor_tagged_stash 1181 ? cbor_tagged_stash
950 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1182 : gv_stashpv ("CBOR::XS::Tagged" , 1);
968static SV * 1200static SV *
969decode_sv (dec_t *dec) 1201decode_sv (dec_t *dec)
970{ 1202{
971 WANT (1); 1203 WANT (1);
972 1204
973 switch (*dec->cur >> 5) 1205 switch (*dec->cur >> MAJOR_SHIFT)
974 { 1206 {
975 case 0: // unsigned int 1207 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
976 return newSVuv (decode_uint (dec)); 1208 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
977 case 1: // negative int 1209 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
978 return newSViv (-1 - (IV)decode_uint (dec)); 1210 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
979 case 2: // octet string 1211 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
980 return decode_str (dec, 0); 1212 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
981 case 3: // utf-8 string 1213 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
982 return decode_str (dec, 1); 1214
983 case 4: // array 1215 case MAJOR_MISC >> MAJOR_SHIFT:
984 return decode_av (dec);
985 case 5: // map
986 return decode_hv (dec);
987 case 6: // tag
988 return decode_tagged (dec);
989 case 7: // misc
990 switch (*dec->cur++ & 31) 1216 switch (*dec->cur++ & MINOR_MASK)
991 { 1217 {
992 case 20: 1218 case SIMPLE_FALSE:
993#if CBOR_SLOW 1219#if CBOR_SLOW
994 types_false = get_bool ("Types::Serialiser::false"); 1220 types_false = get_bool ("Types::Serialiser::false");
995#endif 1221#endif
996 return newSVsv (types_false); 1222 return newSVsv (types_false);
997 case 21: 1223 case SIMPLE_TRUE:
998#if CBOR_SLOW 1224#if CBOR_SLOW
999 types_true = get_bool ("Types::Serialiser::true"); 1225 types_true = get_bool ("Types::Serialiser::true");
1000#endif 1226#endif
1001 return newSVsv (types_true); 1227 return newSVsv (types_true);
1002 case 22: 1228 case SIMPLE_NULL:
1003 return newSVsv (&PL_sv_undef); 1229 return newSVsv (&PL_sv_undef);
1004 case 23: 1230 case SIMPLE_UNDEF:
1005#if CBOR_SLOW 1231#if CBOR_SLOW
1006 types_error = get_bool ("Types::Serialiser::error"); 1232 types_error = get_bool ("Types::Serialiser::error");
1007#endif 1233#endif
1008 return newSVsv (types_error); 1234 return newSVsv (types_error);
1009 1235
1010 case 25: 1236 case MISC_FLOAT16:
1011 { 1237 {
1012 WANT (2); 1238 WANT (2);
1013 1239
1014 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1240 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
1015 dec->cur += 2; 1241 dec->cur += 2;
1016 1242
1017 return newSVnv (ecb_binary16_to_float (fp)); 1243 return newSVnv (ecb_binary16_to_float (fp));
1018 } 1244 }
1019 1245
1020 case 26: 1246 case MISC_FLOAT32:
1021 { 1247 {
1022 uint32_t fp; 1248 uint32_t fp;
1023 WANT (4); 1249 WANT (4);
1024 memcpy (&fp, dec->cur, 4); 1250 memcpy (&fp, dec->cur, 4);
1025 dec->cur += 4; 1251 dec->cur += 4;
1028 fp = ecb_bswap32 (fp); 1254 fp = ecb_bswap32 (fp);
1029 1255
1030 return newSVnv (ecb_binary32_to_float (fp)); 1256 return newSVnv (ecb_binary32_to_float (fp));
1031 } 1257 }
1032 1258
1033 case 27: 1259 case MISC_FLOAT64:
1034 { 1260 {
1035 uint64_t fp; 1261 uint64_t fp;
1036 WANT (8); 1262 WANT (8);
1037 memcpy (&fp, dec->cur, 8); 1263 memcpy (&fp, dec->cur, 8);
1038 dec->cur += 8; 1264 dec->cur += 8;
1041 fp = ecb_bswap64 (fp); 1267 fp = ecb_bswap64 (fp);
1042 1268
1043 return newSVnv (ecb_binary64_to_double (fp)); 1269 return newSVnv (ecb_binary64_to_double (fp));
1044 } 1270 }
1045 1271
1046 // 0..19 unassigned 1272 // 0..19 unassigned simple
1047 // 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
1048 default: 1276 default:
1049 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1277 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1050 } 1278 }
1051 1279
1052 break; 1280 break;
1053 } 1281 }
1054 1282
1057} 1285}
1058 1286
1059static SV * 1287static SV *
1060decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1288decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1061{ 1289{
1062 dec_t dec = { }; 1290 dec_t dec = { 0 };
1063 SV *sv; 1291 SV *sv;
1064 STRLEN len; 1292 STRLEN len;
1065 char *data = SvPVbyte (string, len); 1293 char *data = SvPVbyte (string, len);
1066 1294
1067 if (len > cbor->max_size && cbor->max_size) 1295 if (len > cbor->max_size && cbor->max_size)
1081 if (dec.cur != dec.end && !dec.err) 1309 if (dec.cur != dec.end && !dec.err)
1082 dec.err = "garbage after CBOR object"; 1310 dec.err = "garbage after CBOR object";
1083 1311
1084 if (dec.err) 1312 if (dec.err)
1085 { 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
1086 SvREFCNT_dec (sv); 1325 SvREFCNT_dec_NN (sv);
1326
1327 if (dec.err_sv)
1328 sv_2mortal (dec.err_sv);
1329
1087 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);
1088 } 1331 }
1089 1332
1090 sv = sv_2mortal (sv); 1333 sv = sv_2mortal (sv);
1091 1334
1092 return sv; 1335 return sv;
1093} 1336}
1094 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
1095///////////////////////////////////////////////////////////////////////////// 1462/////////////////////////////////////////////////////////////////////////////
1096// XS interface functions 1463// XS interface functions
1097 1464
1098MODULE = CBOR::XS PACKAGE = CBOR::XS 1465MODULE = CBOR::XS PACKAGE = CBOR::XS
1099 1466
1111 1478
1112 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1479 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1113 1480
1114 sv_cbor = newSVpv ("CBOR", 0); 1481 sv_cbor = newSVpv ("CBOR", 0);
1115 SvREADONLY_on (sv_cbor); 1482 SvREADONLY_on (sv_cbor);
1483
1484 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1116} 1485}
1117 1486
1118PROTOTYPES: DISABLE 1487PROTOTYPES: DISABLE
1119 1488
1120void CLONE (...) 1489void CLONE (...)
1139void shrink (CBOR *self, int enable = 1) 1508void shrink (CBOR *self, int enable = 1)
1140 ALIAS: 1509 ALIAS:
1141 shrink = F_SHRINK 1510 shrink = F_SHRINK
1142 allow_unknown = F_ALLOW_UNKNOWN 1511 allow_unknown = F_ALLOW_UNKNOWN
1143 allow_sharing = F_ALLOW_SHARING 1512 allow_sharing = F_ALLOW_SHARING
1144 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
1145 PPCODE: 1519 PPCODE:
1146{ 1520{
1147 if (enable) 1521 if (enable)
1148 self->flags |= ix; 1522 self->flags |= ix;
1149 else 1523 else
1155void get_shrink (CBOR *self) 1529void get_shrink (CBOR *self)
1156 ALIAS: 1530 ALIAS:
1157 get_shrink = F_SHRINK 1531 get_shrink = F_SHRINK
1158 get_allow_unknown = F_ALLOW_UNKNOWN 1532 get_allow_unknown = F_ALLOW_UNKNOWN
1159 get_allow_sharing = F_ALLOW_SHARING 1533 get_allow_sharing = F_ALLOW_SHARING
1160 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
1161 PPCODE: 1540 PPCODE:
1162 XPUSHs (boolSV (self->flags & ix)); 1541 XPUSHs (boolSV (self->flags & ix));
1163 1542
1164void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1543void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1165 PPCODE: 1544 PPCODE:
1214 EXTEND (SP, 2); 1593 EXTEND (SP, 2);
1215 PUSHs (sv); 1594 PUSHs (sv);
1216 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1595 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1217} 1596}
1218 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
1219void DESTROY (CBOR *self) 1650void DESTROY (CBOR *self)
1220 PPCODE: 1651 PPCODE:
1221 cbor_free (self); 1652 cbor_free (self);
1222 1653
1223PROTOTYPES: ENABLE 1654PROTOTYPES: ENABLE
1224 1655
1225void encode_cbor (SV *scalar) 1656void encode_cbor (SV *scalar)
1657 ALIAS:
1658 encode_cbor = 0
1659 encode_cbor_sharing = F_ALLOW_SHARING
1226 PPCODE: 1660 PPCODE:
1227{ 1661{
1228 CBOR cbor; 1662 CBOR cbor;
1229 cbor_init (&cbor); 1663 cbor_init (&cbor);
1664 cbor.flags |= ix;
1230 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1665 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1231 XPUSHs (scalar); 1666 XPUSHs (scalar);
1232} 1667}
1233 1668
1234void decode_cbor (SV *cborstr) 1669void decode_cbor (SV *cborstr)
1238 cbor_init (&cbor); 1673 cbor_init (&cbor);
1239 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1674 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
1240 XPUSHs (cborstr); 1675 XPUSHs (cborstr);
1241} 1676}
1242 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