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.16 by root, Tue Oct 29 20:59:16 2013 UTC vs.
Revision 1.62 by root, Sat Nov 26 02:11:52 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines