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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines