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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines