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.20 by root, Wed Nov 20 11:06:42 2013 UTC vs.
Revision 1.60 by root, Sat Nov 26 00:47:02 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines