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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines