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.7 by root, Sat Oct 26 23:02:55 2013 UTC vs.
Revision 1.64 by root, Tue Jun 27 02:03:24 2017 UTC

6#include <string.h> 6#include <string.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h> 8#include <stdio.h>
9#include <limits.h> 9#include <limits.h>
10#include <float.h> 10#include <float.h>
11#include <inttypes.h>
11 12
13#define ECB_NO_THREADS 1
12#include "ecb.h" 14#include "ecb.h"
13 15
16// compatibility with perl <5.18
17#ifndef HvNAMELEN_get
18# define HvNAMELEN_get(hv) strlen (HvNAME (hv))
19#endif
20#ifndef HvNAMELEN
21# define HvNAMELEN(hv) HvNAMELEN_get (hv)
22#endif
23#ifndef HvNAMEUTF8
24# define HvNAMEUTF8(hv) 0
25#endif
26#ifndef SvREFCNT_inc_NN
27# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
28#endif
29#ifndef SvREFCNT_dec_NN
30# define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv)
31#endif
32
33// known major and minor types
34enum cbor_type
35{
36 MAJOR_SHIFT = 5,
37 MINOR_MASK = 0x1f,
38
39 MAJOR_POS_INT = 0 << MAJOR_SHIFT,
40 MAJOR_NEG_INT = 1 << MAJOR_SHIFT,
41 MAJOR_BYTES = 2 << MAJOR_SHIFT,
42 MAJOR_TEXT = 3 << MAJOR_SHIFT,
43 MAJOR_ARRAY = 4 << MAJOR_SHIFT,
44 MAJOR_MAP = 5 << MAJOR_SHIFT,
45 MAJOR_TAG = 6 << MAJOR_SHIFT,
46 MAJOR_MISC = 7 << MAJOR_SHIFT,
47
48 // INT/STRING/ARRAY/MAP subtypes
49 LENGTH_EXT1 = 24,
50 LENGTH_EXT2 = 25,
51 LENGTH_EXT4 = 26,
52 LENGTH_EXT8 = 27,
53
54 // SIMPLE types (effectively MISC subtypes)
55 SIMPLE_FALSE = 20,
56 SIMPLE_TRUE = 21,
57 SIMPLE_NULL = 22,
58 SIMPLE_UNDEF = 23,
59
60 // MISC subtype (unused)
61 MISC_EXT1 = 24,
62 MISC_FLOAT16 = 25,
63 MISC_FLOAT32 = 26,
64 MISC_FLOAT64 = 27,
65
66 // BYTES/TEXT/ARRAY/MAP
67 MINOR_INDEF = 31,
68};
69
70// known tags
71enum cbor_tag
72{
73 // extensions
74 CBOR_TAG_STRINGREF = 25, // http://cbor.schmorp.de/stringref
75 CBOR_TAG_PERL_OBJECT = 26, // http://cbor.schmorp.de/perl-object
76 CBOR_TAG_GENERIC_OBJECT = 27, // http://cbor.schmorp.de/generic-object
77 CBOR_TAG_VALUE_SHAREABLE = 28, // http://cbor.schmorp.de/value-sharing
78 CBOR_TAG_VALUE_SHAREDREF = 29, // http://cbor.schmorp.de/value-sharing
79 CBOR_TAG_STRINGREF_NAMESPACE = 256, // http://cbor.schmorp.de/stringref
80 CBOR_TAG_INDIRECTION = 22098, // http://cbor.schmorp.de/indirection
81
82 // rfc7049
83 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
84 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
85 CBOR_TAG_POS_BIGNUM = 2, // byte string
86 CBOR_TAG_NEG_BIGNUM = 3, // byte string
87 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
88 CBOR_TAG_BIGFLOAT = 5, // array
89
90 CBOR_TAG_CONV_B64U = 21, // base64url, any
91 CBOR_TAG_CONV_B64 = 22, // base64, any
92 CBOR_TAG_CONV_HEX = 23, // base16, any
93 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
94
95 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
96 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
97 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
98 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
100
101 CBOR_TAG_MAGIC = 55799, // self-describe cbor
102};
103
14#define F_SHRINK 0x00000200UL 104#define F_SHRINK 0x00000001UL
15#define F_ALLOW_UNKNOWN 0x00002000UL 105#define F_ALLOW_UNKNOWN 0x00000002UL
106#define F_ALLOW_SHARING 0x00000004UL
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
16 113
17#define INIT_SIZE 32 // initial scalar size to be allocated 114#define INIT_SIZE 32 // initial scalar size to be allocated
18 115
19#define SB do { 116#define SB do {
20#define SE } while (0) 117#define SE } while (0)
31#else 128#else
32# define CBOR_SLOW 0 129# define CBOR_SLOW 0
33# define CBOR_STASH cbor_stash 130# define CBOR_STASH cbor_stash
34#endif 131#endif
35 132
36static HV *cbor_stash, *cbor_boolean_stash, *cbor_tagged_stash; // CBOR::XS:: 133static HV *cbor_stash, *types_boolean_stash, *types_error_stash, *cbor_tagged_stash; // CBOR::XS::
37static SV *cbor_true, *cbor_false; 134static SV *types_true, *types_false, *types_error, *sv_cbor, *default_filter;
38 135
39typedef struct { 136typedef struct {
40 U32 flags; 137 U32 flags;
41 U32 max_depth; 138 U32 max_depth;
42 STRLEN max_size; 139 STRLEN max_size;
140 SV *filter;
141
142 // for the incremental parser
143 STRLEN incr_pos; // the current offset into the text
144 STRLEN incr_need; // minimum bytes needed to decode
145 AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
43} CBOR; 146} CBOR;
44 147
45ecb_inline void 148ecb_inline void
46cbor_init (CBOR *cbor) 149cbor_init (CBOR *cbor)
47{ 150{
48 Zero (cbor, 1, CBOR); 151 Zero (cbor, 1, CBOR);
49 cbor->max_depth = 512; 152 cbor->max_depth = 512;
153}
154
155ecb_inline void
156cbor_free (CBOR *cbor)
157{
158 SvREFCNT_dec (cbor->filter);
159 SvREFCNT_dec (cbor->incr_count);
50} 160}
51 161
52///////////////////////////////////////////////////////////////////////////// 162/////////////////////////////////////////////////////////////////////////////
53// utility functions 163// utility functions
54 164
76 SvPV_renew (sv, SvCUR (sv) + 1); 186 SvPV_renew (sv, SvCUR (sv) + 1);
77#endif 187#endif
78 } 188 }
79} 189}
80 190
81///////////////////////////////////////////////////////////////////////////// 191// minimum length of a string to be registered for stringref
82// fp hell 192ecb_inline int
83 193minimum_string_length (UV idx)
84//TODO 194{
195 return idx <= 23 ? 3
196 : idx <= 0xffU ? 4
197 : idx <= 0xffffU ? 5
198 : idx <= 0xffffffffU ? 7
199 : 11;
200}
85 201
86///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
87// encoder 203// encoder
88 204
89// structure used for encoding CBOR 205// structure used for encoding CBOR
92 char *cur; // SvPVX (sv) + current output position 208 char *cur; // SvPVX (sv) + current output position
93 char *end; // SvEND (sv) 209 char *end; // SvEND (sv)
94 SV *sv; // result scalar 210 SV *sv; // result scalar
95 CBOR cbor; 211 CBOR cbor;
96 U32 depth; // recursion level 212 U32 depth; // recursion level
213 HV *stringref[2]; // string => index, or 0 ([0] = bytes, [1] = utf-8)
214 UV stringref_idx;
215 HV *shareable; // ptr => index, or 0
216 UV shareable_idx;
97} enc_t; 217} enc_t;
98 218
99ecb_inline void 219ecb_inline void
100need (enc_t *enc, STRLEN len) 220need (enc_t *enc, STRLEN len)
101{ 221{
102 if (ecb_expect_false (enc->cur + len >= enc->end)) 222 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
103 { 223 {
104 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 224 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
105 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 225 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
106 enc->cur = SvPVX (enc->sv) + cur; 226 enc->cur = SvPVX (enc->sv) + cur;
107 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
118static void 238static void
119encode_uint (enc_t *enc, int major, UV len) 239encode_uint (enc_t *enc, int major, UV len)
120{ 240{
121 need (enc, 9); 241 need (enc, 9);
122 242
123 if (len < 24) 243 if (ecb_expect_true (len < LENGTH_EXT1))
124 *enc->cur++ = major | len; 244 *enc->cur++ = major | len;
125 else if (len <= 0xff) 245 else if (ecb_expect_true (len <= 0xffU))
126 { 246 {
127 *enc->cur++ = major | 24; 247 *enc->cur++ = major | LENGTH_EXT1;
128 *enc->cur++ = len; 248 *enc->cur++ = len;
129 } 249 }
130 else if (len <= 0xffff) 250 else if (len <= 0xffffU)
131 { 251 {
132 *enc->cur++ = major | 25; 252 *enc->cur++ = major | LENGTH_EXT2;
133 *enc->cur++ = len >> 8; 253 *enc->cur++ = len >> 8;
134 *enc->cur++ = len; 254 *enc->cur++ = len;
135 } 255 }
136 else if (len <= 0xffffffff) 256 else if (len <= 0xffffffffU)
137 { 257 {
138 *enc->cur++ = major | 26; 258 *enc->cur++ = major | LENGTH_EXT4;
139 *enc->cur++ = len >> 24; 259 *enc->cur++ = len >> 24;
140 *enc->cur++ = len >> 16; 260 *enc->cur++ = len >> 16;
141 *enc->cur++ = len >> 8; 261 *enc->cur++ = len >> 8;
142 *enc->cur++ = len; 262 *enc->cur++ = len;
143 } 263 }
144 else 264 else
145 { 265 {
146 *enc->cur++ = major | 27; 266 *enc->cur++ = major | LENGTH_EXT8;
147 *enc->cur++ = len >> 56; 267 *enc->cur++ = len >> 56;
148 *enc->cur++ = len >> 48; 268 *enc->cur++ = len >> 48;
149 *enc->cur++ = len >> 40; 269 *enc->cur++ = len >> 40;
150 *enc->cur++ = len >> 32; 270 *enc->cur++ = len >> 32;
151 *enc->cur++ = len >> 24; 271 *enc->cur++ = len >> 24;
153 *enc->cur++ = len >> 8; 273 *enc->cur++ = len >> 8;
154 *enc->cur++ = len; 274 *enc->cur++ = len;
155 } 275 }
156} 276}
157 277
158static void 278ecb_inline void
279encode_tag (enc_t *enc, UV tag)
280{
281 encode_uint (enc, MAJOR_TAG, tag);
282}
283
284// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
285ecb_noinline static void
159encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 286encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
160{ 287{
161 encode_uint (enc, utf8 ? 0x60 : 0x40, len); 288 STRLEN ulen = len;
289 U8 *p, *pend = (U8 *)str + len;
290
291 for (p = (U8 *)str; p < pend; ++p)
292 ulen += *p >> 7; // count set high bits
293
294 encode_uint (enc, MAJOR_TEXT, ulen);
295
296 need (enc, ulen);
297 for (p = (U8 *)str; p < pend; ++p)
298 if (*p < 0x80)
299 *enc->cur++ = *p;
300 else
301 {
302 *enc->cur++ = 0xc0 + (*p >> 6);
303 *enc->cur++ = 0x80 + (*p & 63);
304 }
305}
306
307ecb_inline void
308encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
309{
310 if (ecb_expect_false (upgrade_utf8))
311 if (!utf8)
312 {
313 encode_str_utf8 (enc, utf8, str, len);
314 return;
315 }
316
317 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
162 need (enc, len); 318 need (enc, len);
163 memcpy (enc->cur, str, len); 319 memcpy (enc->cur, str, len);
164 enc->cur += len; 320 enc->cur += len;
165} 321}
166 322
323ecb_inline void
324encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
325{
326 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
327 {
328 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
329
330 if (SvOK (*svp))
331 {
332 // already registered, use stringref
333 encode_tag (enc, CBOR_TAG_STRINGREF);
334 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
335 return;
336 }
337 else if (len >= minimum_string_length (enc->stringref_idx))
338 {
339 // register only
340 sv_setuv (*svp, enc->stringref_idx);
341 ++enc->stringref_idx;
342 }
343 }
344
345 encode_str (enc, upgrade_utf8, utf8, str, len);
346}
347
167static void encode_sv (enc_t *enc, SV *sv); 348static void encode_sv (enc_t *enc, SV *sv);
168 349
169static void 350static void
170encode_av (enc_t *enc, AV *av) 351encode_av (enc_t *enc, AV *av)
171{ 352{
174 if (enc->depth >= enc->cbor.max_depth) 355 if (enc->depth >= enc->cbor.max_depth)
175 croak (ERR_NESTING_EXCEEDED); 356 croak (ERR_NESTING_EXCEEDED);
176 357
177 ++enc->depth; 358 ++enc->depth;
178 359
179 encode_uint (enc, 0x80, len + 1); 360 encode_uint (enc, MAJOR_ARRAY, len + 1);
180 361
362 if (ecb_expect_false (SvMAGICAL (av)))
181 for (i = 0; i <= len; ++i) 363 for (i = 0; i <= len; ++i)
182 { 364 {
183 SV **svp = av_fetch (av, i, 0); 365 SV **svp = av_fetch (av, i, 0);
184 encode_sv (enc, svp ? *svp : &PL_sv_undef); 366 encode_sv (enc, svp ? *svp : &PL_sv_undef);
185 } 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 }
186 374
187 --enc->depth; 375 --enc->depth;
188} 376}
189 377
190static void 378static void
198 ++enc->depth; 386 ++enc->depth;
199 387
200 int pairs = hv_iterinit (hv); 388 int pairs = hv_iterinit (hv);
201 int mg = SvMAGICAL (hv); 389 int mg = SvMAGICAL (hv);
202 390
203 if (mg) 391 if (ecb_expect_false (mg))
204 encode_ch (enc, 0xa0 | 31); 392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
205 else 393 else
206 encode_uint (enc, 0xa0, pairs); 394 encode_uint (enc, MAJOR_MAP, pairs);
207 395
208 while ((he = hv_iternext (hv))) 396 while ((he = hv_iternext (hv)))
209 { 397 {
210 if (HeKLEN (he) == HEf_SVKEY) 398 if (HeKLEN (he) == HEf_SVKEY)
211 encode_sv (enc, HeSVKEY (he)); 399 encode_sv (enc, HeSVKEY (he));
212 else 400 else
213 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));
214 402
215 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));
216 } 404 }
217 405
218 if (mg) 406 if (ecb_expect_false (mg))
219 encode_ch (enc, 0xe0 | 31); 407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
220 408
221 --enc->depth; 409 --enc->depth;
222} 410}
223 411
224// encode objects, arrays and special \0=false and \1=true values. 412// encode objects, arrays and special \0=false and \1=true values.
225static void 413static void
226encode_rv (enc_t *enc, SV *sv) 414encode_rv (enc_t *enc, SV *sv)
227{ 415{
228 svtype svt;
229
230 SvGETMAGIC (sv); 416 SvGETMAGIC (sv);
417
231 svt = SvTYPE (sv); 418 svtype svt = SvTYPE (sv);
232 419
233 if (ecb_expect_false (SvOBJECT (sv))) 420 if (ecb_expect_false (SvOBJECT (sv)))
234 { 421 {
235 HV *boolean_stash = !CBOR_SLOW || cbor_boolean_stash 422 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
236 ? cbor_boolean_stash 423 ? types_boolean_stash
237 : gv_stashpv ("CBOR::XS::Boolean", 1); 424 : gv_stashpv ("Types::Serialiser::Boolean", 1);
425 HV *error_stash = !CBOR_SLOW || types_error_stash
426 ? types_error_stash
427 : gv_stashpv ("Types::Serialiser::Error", 1);
238 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 428 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
239 ? cbor_tagged_stash 429 ? cbor_tagged_stash
240 : gv_stashpv ("CBOR::XS::Tagged" , 1); 430 : gv_stashpv ("CBOR::XS::Tagged" , 1);
241 431
432 HV *stash = SvSTASH (sv);
433
242 if (SvSTASH (sv) == boolean_stash) 434 if (stash == boolean_stash)
243 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 }
439 else if (stash == error_stash)
440 {
441 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
442 return;
443 }
244 else if (SvSTASH (sv) == tagged_stash) 444 else if (stash == tagged_stash)
245 { 445 {
246 if (svt != SVt_PVAV) 446 if (svt != SVt_PVAV)
247 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 447 croak ("encountered CBOR::XS::Tagged object that isn't an array");
248 448
249 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 449 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
250 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))
465 {
466 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
467 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
468 return;
251 } 469 }
252 else 470 else
253 { 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))));
486 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
487 {
488 dSP;
489
490 ENTER; SAVETMPS;
491 PUSHMARK (SP);
254 // 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
255 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
256
257 if (to_cbor)
258 {
259 dSP;
260
261 ENTER; SAVETMPS; PUSHMARK (SP);
262 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 493 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
263 494
264 // calling with G_SCALAR ensures that we always get a 1 return value
265 PUTBACK; 495 PUTBACK;
496 // G_SCALAR ensures that return value is 1
266 call_sv ((SV *)GvCV (to_cbor), G_SCALAR); 497 call_sv ((SV *)GvCV (method), G_SCALAR);
267 SPAGAIN; 498 SPAGAIN;
268 499
269 // catch this surprisingly common error 500 // catch this surprisingly common error
270 if (SvROK (TOPs) && SvRV (TOPs) == sv) 501 if (SvROK (TOPs) && SvRV (TOPs) == sv)
271 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (SvSTASH (sv))); 502 croak ("%s::TO_CBOR method returned same object as was passed instead of a new one", HvNAME (stash));
272 503
273 sv = POPs; 504 encode_sv (enc, POPs);
505
274 PUTBACK; 506 PUTBACK;
275 507
276 encode_sv (enc, sv);
277
278 FREETMPS; LEAVE; 508 FREETMPS; LEAVE;
279 } 509 }
510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
511 {
512 dSP;
513
514 ENTER; SAVETMPS;
515 SAVESTACK_POS ();
516 PUSHMARK (SP);
517 EXTEND (SP, 2);
518 // we re-bless the reference to get overload and other niceties right
519 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
520 PUSHs (sv_cbor);
521
522 PUTBACK;
523 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
524 SPAGAIN;
525
526 // catch this surprisingly common error
527 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
528 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
529
530 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
531 encode_uint (enc, MAJOR_ARRAY, count + 1);
532 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
533
534 while (count)
535 encode_sv (enc, SP[1 - count--]);
536
537 PUTBACK;
538
539 FREETMPS; LEAVE;
540 }
280 else 541 else
281 croak ("encountered object '%s', but no TO_CBOR method available on it", 542 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
282 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 543 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
283 }
284 } 544 }
285 else if (svt == SVt_PVHV) 545 else if (svt == SVt_PVHV)
286 encode_hv (enc, (HV *)sv); 546 encode_hv (enc, (HV *)sv);
287 else if (svt == SVt_PVAV) 547 else if (svt == SVt_PVAV)
288 encode_av (enc, (AV *)sv); 548 encode_av (enc, (AV *)sv);
289 else if (svt < SVt_PVAV)
290 {
291 STRLEN len = 0;
292 char *pv = svt ? SvPV (sv, len) : 0;
293
294 if (len == 1 && *pv == '1')
295 encode_ch (enc, 0xe0 | 21);
296 else if (len == 1 && *pv == '0')
297 encode_ch (enc, 0xe0 | 20);
298 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
299 encode_ch (enc, 0xe0 | 23);
300 else
301 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
302 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
303 }
304 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
305 encode_ch (enc, 0xe0 | 23);
306 else 549 else
307 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 550 {
308 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 551 encode_tag (enc, CBOR_TAG_INDIRECTION);
552 encode_sv (enc, sv);
553 }
309} 554}
310 555
311static void 556static void
312encode_nv (enc_t *enc, SV *sv) 557encode_nv (enc_t *enc, SV *sv)
313{ 558{
314 double nv = SvNVX (sv); 559 double nv = SvNVX (sv);
315 560
316 need (enc, 9); 561 need (enc, 9);
317 562
318 if (ecb_expect_false (nv == (U32)nv)) 563 if (ecb_expect_false (nv == (NV)(U32)nv))
319 encode_uint (enc, 0x00, (U32)nv); 564 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
320 //TODO: maybe I32? 565 //TODO: maybe I32?
321 else if (ecb_expect_false (nv == (float)nv)) 566 else if (ecb_expect_false (nv == (float)nv))
322 { 567 {
568 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
569
323 uint32_t fp = ecb_float_to_binary32 (nv); 570 uint32_t fp = ecb_float_to_binary32 (nv);
324
325 *enc->cur++ = 0xe0 | 26;
326 571
327 if (!ecb_big_endian ()) 572 if (!ecb_big_endian ())
328 fp = ecb_bswap32 (fp); 573 fp = ecb_bswap32 (fp);
329 574
330 memcpy (enc->cur, &fp, 4); 575 memcpy (enc->cur, &fp, 4);
331 enc->cur += 4; 576 enc->cur += 4;
332 } 577 }
333 else 578 else
334 { 579 {
580 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
581
335 uint64_t fp = ecb_double_to_binary64 (nv); 582 uint64_t fp = ecb_double_to_binary64 (nv);
336
337 *enc->cur++ = 0xe0 | 27;
338 583
339 if (!ecb_big_endian ()) 584 if (!ecb_big_endian ())
340 fp = ecb_bswap64 (fp); 585 fp = ecb_bswap64 (fp);
341 586
342 memcpy (enc->cur, &fp, 8); 587 memcpy (enc->cur, &fp, 8);
351 596
352 if (SvPOKp (sv)) 597 if (SvPOKp (sv))
353 { 598 {
354 STRLEN len; 599 STRLEN len;
355 char *str = SvPV (sv, len); 600 char *str = SvPV (sv, len);
356 encode_str (enc, SvUTF8 (sv), str, len); 601 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
357 } 602 }
358 else if (SvNOKp (sv)) 603 else if (SvNOKp (sv))
359 encode_nv (enc, sv); 604 encode_nv (enc, sv);
360 else if (SvIOKp (sv)) 605 else if (SvIOKp (sv))
361 { 606 {
362 if (SvIsUV (sv)) 607 if (SvIsUV (sv))
363 encode_uint (enc, 0x00, SvUVX (sv)); 608 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
364 else if (SvIVX (sv) >= 0) 609 else if (SvIVX (sv) >= 0)
365 encode_uint (enc, 0x00, SvIVX (sv)); 610 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
366 else 611 else
367 encode_uint (enc, 0x20, -(SvIVX (sv) + 1)); 612 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
368 } 613 }
369 else if (SvROK (sv)) 614 else if (SvROK (sv))
370 encode_rv (enc, SvRV (sv)); 615 encode_rv (enc, SvRV (sv));
371 else if (!SvOK (sv)) 616 else if (!SvOK (sv))
372 encode_ch (enc, 0xe0 | 22); 617 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
373 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 618 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
374 encode_ch (enc, 0xe0 | 23); 619 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
375 else 620 else
376 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",
377 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 622 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
378} 623}
379 624
380static SV * 625static SV *
381encode_cbor (SV *scalar, CBOR *cbor) 626encode_cbor (SV *scalar, CBOR *cbor)
382{ 627{
383 enc_t enc; 628 enc_t enc = { 0 };
384 629
385 enc.cbor = *cbor; 630 enc.cbor = *cbor;
386 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 631 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
387 enc.cur = SvPVX (enc.sv); 632 enc.cur = SvPVX (enc.sv);
388 enc.end = SvEND (enc.sv); 633 enc.end = SvEND (enc.sv);
389 enc.depth = 0;
390 634
391 SvPOK_only (enc.sv); 635 SvPOK_only (enc.sv);
636
637 if (cbor->flags & F_PACK_STRINGS)
638 {
639 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
640 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
641 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
642 }
643
392 encode_sv (&enc, scalar); 644 encode_sv (&enc, scalar);
393 645
394 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 646 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
395 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 647 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
396 648
410 U8 *end; // end of input string 662 U8 *end; // end of input string
411 const char *err; // parse error, if != 0 663 const char *err; // parse error, if != 0
412 CBOR cbor; 664 CBOR cbor;
413 U32 depth; // recursion depth 665 U32 depth; // recursion depth
414 U32 maxdepth; // recursion depth limit 666 U32 maxdepth; // recursion depth limit
667 AV *shareable;
668 AV *stringref;
669 SV *decode_tagged;
670 SV *err_sv; // optional sv for error, needs to be freed
415} dec_t; 671} dec_t;
416 672
417#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);
418 680
419#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;
420 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
421#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)
422#define DEC_DEC_DEPTH --dec->depth 710#define DEC_DEC_DEPTH --dec->depth
423 711
424static UV 712static UV
425decode_uint (dec_t *dec) 713decode_uint (dec_t *dec)
426{ 714{
427 switch (*dec->cur & 31) 715 U8 m = *dec->cur & MINOR_MASK;
428 { 716 ++dec->cur;
429 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
430 case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
431 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
432 return *dec->cur++ & 31;
433 717
434 case 24: 718 if (ecb_expect_true (m < LENGTH_EXT1))
719 return m;
720 else if (ecb_expect_true (m == LENGTH_EXT1))
721 {
435 WANT (2); 722 WANT (1);
436 dec->cur += 2; 723 dec->cur += 1;
437 return dec->cur[-1]; 724 return dec->cur[-1];
438 725 }
439 case 25: 726 else if (ecb_expect_true (m == LENGTH_EXT2))
727 {
440 WANT (3); 728 WANT (2);
441 dec->cur += 3; 729 dec->cur += 2;
442 return (((UV)dec->cur[-2]) << 8) 730 return (((UV)dec->cur[-2]) << 8)
443 | ((UV)dec->cur[-1]); 731 | ((UV)dec->cur[-1]);
444 732 }
445 case 26: 733 else if (ecb_expect_true (m == LENGTH_EXT4))
734 {
446 WANT (5); 735 WANT (4);
447 dec->cur += 5; 736 dec->cur += 4;
448 return (((UV)dec->cur[-4]) << 24) 737 return (((UV)dec->cur[-4]) << 24)
449 | (((UV)dec->cur[-3]) << 16) 738 | (((UV)dec->cur[-3]) << 16)
450 | (((UV)dec->cur[-2]) << 8) 739 | (((UV)dec->cur[-2]) << 8)
451 | ((UV)dec->cur[-1]); 740 | ((UV)dec->cur[-1]);
452 741 }
453 case 27: 742 else if (ecb_expect_true (m == LENGTH_EXT8))
743 {
454 WANT (9); 744 WANT (8);
455 dec->cur += 9; 745 dec->cur += 8;
746
747 return
748#if UVSIZE < 8
749 0
750#else
456 return (((UV)dec->cur[-8]) << 56) 751 (((UV)dec->cur[-8]) << 56)
457 | (((UV)dec->cur[-7]) << 48) 752 | (((UV)dec->cur[-7]) << 48)
458 | (((UV)dec->cur[-6]) << 40) 753 | (((UV)dec->cur[-6]) << 40)
459 | (((UV)dec->cur[-5]) << 32) 754 | (((UV)dec->cur[-5]) << 32)
755#endif
460 | (((UV)dec->cur[-4]) << 24) 756 | (((UV)dec->cur[-4]) << 24)
461 | (((UV)dec->cur[-3]) << 16) 757 | (((UV)dec->cur[-3]) << 16)
462 | (((UV)dec->cur[-2]) << 8) 758 | (((UV)dec->cur[-2]) << 8)
463 | ((UV)dec->cur[-1]); 759 | ((UV)dec->cur[-1]);
464 760 }
465 default: 761 else
466 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 762 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
467 }
468 763
469fail: 764fail:
470 return 0; 765 return 0;
471} 766}
472 767
477{ 772{
478 AV *av = newAV (); 773 AV *av = newAV ();
479 774
480 DEC_INC_DEPTH; 775 DEC_INC_DEPTH;
481 776
482 if ((*dec->cur & 31) == 31) 777 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
483 { 778 {
484 ++dec->cur; 779 ++dec->cur;
485 780
486 for (;;) 781 for (;;)
487 { 782 {
488 WANT (1); 783 WANT (1);
489 784
490 if (*dec->cur == (0xe0 | 31)) 785 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
491 { 786 {
492 ++dec->cur; 787 ++dec->cur;
493 break; 788 break;
494 } 789 }
495 790
496 av_push (av, decode_sv (dec)); 791 av_push (av, decode_sv (dec));
497 } 792 }
498 } 793 }
499 else 794 else
500 { 795 {
501 int i, len = decode_uint (dec); 796 UV i, len = decode_uint (dec);
502 797
798 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
503 av_fill (av, len - 1); 799 av_fill (av, len - 1);
504 800
505 for (i = 0; i < len; ++i) 801 for (i = 0; i < len; ++i)
506 AvARRAY (av)[i] = decode_sv (dec); 802 AvARRAY (av)[i] = decode_sv (dec);
507 } 803 }
508 804
509 DEC_DEC_DEPTH; 805 DEC_DEC_DEPTH;
510 return newRV_noinc ((SV *)av); 806 return newRV_noinc ((SV *)av);
511 807
512fail: 808fail:
513 SvREFCNT_dec (av); 809 SvREFCNT_dec_NN (av);
514 DEC_DEC_DEPTH; 810 DEC_DEC_DEPTH;
515 return &PL_sv_undef; 811 return &PL_sv_undef;
516} 812}
517 813
814static void
815decode_he (dec_t *dec, HV *hv)
816{
817 // for speed reasons, we specialcase single-string
818 // byte or utf-8 strings as keys, but only when !stringref
819
820 if (ecb_expect_true (!dec->stringref))
821 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
822 {
823 STRLEN len = decode_uint (dec);
824 char *key = (char *)dec->cur;
825
826 WANT (len);
827 dec->cur += len;
828
829 hv_store (hv, key, len, decode_sv (dec), 0);
830
831 return;
832 }
833 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
834 {
835 STRLEN len = decode_uint (dec);
836 char *key = (char *)dec->cur;
837
838 WANT (len);
839 dec->cur += len;
840
841 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
842 if (!is_utf8_string (key, len))
843 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
844
845 hv_store (hv, key, -len, decode_sv (dec), 0);
846
847 return;
848 }
849
850 SV *k = decode_sv (dec);
851 SV *v = decode_sv (dec);
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
881 hv_store_ent (hv, k, v, 0);
882 SvREFCNT_dec_NN (k);
883
884fail:
885 ;
886}
887
518static SV * 888static SV *
519decode_hv (dec_t *dec) 889decode_hv (dec_t *dec)
520{ 890{
521 HV *hv = newHV (); 891 HV *hv = newHV ();
522 892
523 DEC_INC_DEPTH; 893 DEC_INC_DEPTH;
524 894
525 if ((*dec->cur & 31) == 31) 895 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
526 { 896 {
527 ++dec->cur; 897 ++dec->cur;
528 898
529 for (;;) 899 for (;;)
530 { 900 {
531 WANT (1); 901 WANT (1);
532 902
533 if (*dec->cur == (0xe0 | 31)) 903 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
534 { 904 {
535 ++dec->cur; 905 ++dec->cur;
536 break; 906 break;
537 } 907 }
538 908
539 SV *k = decode_sv (dec); 909 decode_he (dec, hv);
540 SV *v = decode_sv (dec);
541
542 hv_store_ent (hv, k, v, 0);
543 } 910 }
544 } 911 }
545 else 912 else
546 { 913 {
547 int len = decode_uint (dec); 914 UV pairs = decode_uint (dec);
548 915
916 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
917
549 while (len--) 918 while (pairs--)
550 { 919 decode_he (dec, hv);
551 SV *k = decode_sv (dec);
552 SV *v = decode_sv (dec);
553
554 hv_store_ent (hv, k, v, 0);
555 }
556 } 920 }
557 921
558 DEC_DEC_DEPTH; 922 DEC_DEC_DEPTH;
559 return newRV_noinc ((SV *)hv); 923 return newRV_noinc ((SV *)hv);
560 924
561fail: 925fail:
562 SvREFCNT_dec (hv); 926 SvREFCNT_dec_NN (hv);
563 DEC_DEC_DEPTH; 927 DEC_DEC_DEPTH;
564 return &PL_sv_undef; 928 return &PL_sv_undef;
565} 929}
566 930
567static SV * 931static SV *
568decode_str (dec_t *dec, int utf8) 932decode_str (dec_t *dec, int utf8)
569{ 933{
570 SV *sv = 0; 934 SV *sv = 0;
571 935
572 if ((*dec->cur & 31) == 31) 936 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
573 { 937 {
938 // indefinite length strings
574 ++dec->cur; 939 ++dec->cur;
575 940
941 U8 major = *dec->cur & MAJOR_MISC;
942
576 sv = newSVpvn ("", 0); 943 sv = newSVpvn ("", 0);
577 944
578 // not very fast, and certainly not robust against illegal input
579 for (;;) 945 for (;;)
580 { 946 {
581 WANT (1); 947 WANT (1);
582 948
583 if (*dec->cur == (0xe0 | 31)) 949 if ((*dec->cur - major) > LENGTH_EXT8)
950 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
584 { 951 {
585 ++dec->cur; 952 ++dec->cur;
586 break; 953 break;
587 } 954 }
955 else
956 ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
588 957
589 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;
590 } 963 }
591 } 964 }
592 else 965 else
593 { 966 {
594 STRLEN len = decode_uint (dec); 967 STRLEN len = decode_uint (dec);
595 968
596 WANT (len); 969 WANT (len);
597 sv = newSVpvn (dec->cur, len); 970 sv = newSVpvn (dec->cur, len);
598 dec->cur += len; 971 dec->cur += len;
972
973 if (ecb_expect_false (dec->stringref)
974 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
975 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
599 } 976 }
600 977
601 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
602 SvUTF8_on (sv); 984 SvUTF8_on (sv);
985 }
603 986
604 return sv; 987 return sv;
605 988
606fail: 989fail:
607 SvREFCNT_dec (sv); 990 SvREFCNT_dec (sv);
609} 992}
610 993
611static SV * 994static SV *
612decode_tagged (dec_t *dec) 995decode_tagged (dec_t *dec)
613{ 996{
997 SV *sv = 0;
614 UV tag = decode_uint (dec); 998 UV tag = decode_uint (dec);
999
1000 WANT (1);
1001
1002 switch (tag)
1003 {
1004 case CBOR_TAG_MAGIC:
615 SV *sv = decode_sv (dec); 1005 sv = decode_sv (dec);
1006 break;
616 1007
617 if (tag == 55799) // 2.4.5 Self-Describe CBOR 1008 case CBOR_TAG_INDIRECTION:
1009 sv = newRV_noinc (decode_sv (dec));
1010 break;
1011
1012 case CBOR_TAG_STRINGREF_NAMESPACE:
1013 {
1014 // do not use SAVETMPS/FREETMPS, as these will
1015 // erase mortalised caches, e.g. "shareable"
1016 ENTER;
1017
1018 SAVESPTR (dec->stringref);
1019 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
1020
1021 sv = decode_sv (dec);
1022
1023 LEAVE;
1024 }
1025 break;
1026
1027 case CBOR_TAG_STRINGREF:
1028 {
1029 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1030 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
1031
1032 UV idx = decode_uint (dec);
1033
1034 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
1035 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
1036
1037 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
1038 }
1039 break;
1040
1041 case CBOR_TAG_VALUE_SHAREABLE:
1042 {
1043 if (ecb_expect_false (!dec->shareable))
1044 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
1045
1046 if (dec->cbor.flags & F_ALLOW_CYCLES)
1047 {
1048 sv = newSV (0);
1049 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
1050
1051 SV *osv = decode_sv (dec);
1052 sv_setsv (sv, 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 }
1062 }
1063 break;
1064
1065 case CBOR_TAG_VALUE_SHAREDREF:
1066 {
1067 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1068 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1069
1070 UV idx = decode_uint (dec);
1071
1072 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1073 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1074
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");
1079 }
1080 break;
1081
1082 case CBOR_TAG_PERL_OBJECT:
1083 {
1084 if (dec->cbor.flags & F_FORBID_OBJECTS)
1085 goto filter;
1086
1087 sv = decode_sv (dec);
1088
1089 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1090 ERR ("corrupted CBOR data (non-array perl object)");
1091
1092 AV *av = (AV *)SvRV (sv);
1093 int len = av_len (av) + 1;
1094 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
1095
1096 if (!stash)
1097 ERR ("cannot decode perl-object (package does not exist)");
1098
1099 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1100
1101 if (!method)
1102 ERR ("cannot decode perl-object (package does not have a THAW method)");
1103
1104 dSP;
1105
1106 ENTER; SAVETMPS;
1107 PUSHMARK (SP);
1108 EXTEND (SP, len + 1);
1109 // we re-bless the reference to get overload and other niceties right
1110 PUSHs (*av_fetch (av, 0, 1));
1111 PUSHs (sv_cbor);
1112
1113 int i;
1114
1115 for (i = 1; i < len; ++i)
1116 PUSHs (*av_fetch (av, i, 1));
1117
1118 PUTBACK;
1119 call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
1120 SPAGAIN;
1121
1122 if (SvTRUE (ERRSV))
1123 {
1124 FREETMPS; LEAVE;
1125 ERR_ERRSV;
1126 }
1127
1128 SvREFCNT_dec_NN (sv);
1129 sv = SvREFCNT_inc (POPs);
1130
1131 PUTBACK;
1132
1133 FREETMPS; LEAVE;
1134 }
1135 break;
1136
1137 default:
1138 filter:
1139 {
1140 SV *tag_sv = newSVuv (tag);
1141
1142 sv = decode_sv (dec);
1143
1144 dSP;
1145 ENTER; SAVETMPS;
1146 SAVESTACK_POS ();
1147 PUSHMARK (SP);
1148 EXTEND (SP, 2);
1149 PUSHs (tag_sv);
1150 PUSHs (sv);
1151
1152 PUTBACK;
1153 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1154 SPAGAIN;
1155
1156 if (SvTRUE (ERRSV))
1157 {
1158 SvREFCNT_dec_NN (tag_sv);
1159 FREETMPS; LEAVE;
1160 ERR_ERRSV;
1161 }
1162
1163 if (count)
1164 {
1165 SvREFCNT_dec_NN (tag_sv);
1166 SvREFCNT_dec_NN (sv);
1167 sv = SvREFCNT_inc_NN (POPs);
1168 }
1169 else
1170 {
1171 AV *av = newAV ();
1172 av_push (av, tag_sv);
1173 av_push (av, sv);
1174
1175 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1176 ? cbor_tagged_stash
1177 : gv_stashpv ("CBOR::XS::Tagged" , 1);
1178 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
1179 }
1180
1181 PUTBACK;
1182
1183 FREETMPS; LEAVE;
1184 }
1185 break;
1186 }
1187
618 return sv; 1188 return sv;
619 1189
620 AV *av = newAV (); 1190fail:
621 av_push (av, newSVuv (tag)); 1191 SvREFCNT_dec (sv);
622 av_push (av, sv); 1192 return &PL_sv_undef;
623
624 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
625 ? cbor_tagged_stash
626 : gv_stashpv ("CBOR::XS::Tagged" , 1);
627
628 return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
629} 1193}
630 1194
631static SV * 1195static SV *
632decode_sv (dec_t *dec) 1196decode_sv (dec_t *dec)
633{ 1197{
634 WANT (1); 1198 WANT (1);
635 1199
636 switch (*dec->cur >> 5) 1200 switch (*dec->cur >> MAJOR_SHIFT)
637 { 1201 {
638 case 0: // unsigned int 1202 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
639 return newSVuv (decode_uint (dec)); 1203 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
640 case 1: // negative int 1204 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
641 return newSViv (-1 - (IV)decode_uint (dec)); 1205 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
642 case 2: // octet string 1206 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
643 return decode_str (dec, 0); 1207 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
644 case 3: // utf-8 string 1208 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
645 return decode_str (dec, 1); 1209
646 case 4: // array 1210 case MAJOR_MISC >> MAJOR_SHIFT:
647 return decode_av (dec);
648 case 5: // map
649 return decode_hv (dec);
650 case 6: // tag
651 return decode_tagged (dec);
652 case 7: // misc
653 switch (*dec->cur++ & 31) 1211 switch (*dec->cur++ & MINOR_MASK)
654 { 1212 {
655 case 20: 1213 case SIMPLE_FALSE:
656#if CBOR_SLOW 1214#if CBOR_SLOW
657 cbor_false = get_bool ("CBOR::XS::false"); 1215 types_false = get_bool ("Types::Serialiser::false");
658#endif 1216#endif
659 return newSVsv (cbor_false); 1217 return newSVsv (types_false);
660 case 21: 1218 case SIMPLE_TRUE:
661#if CBOR_SLOW 1219#if CBOR_SLOW
662 cbor_true = get_bool ("CBOR::XS::true"); 1220 types_true = get_bool ("Types::Serialiser::true");
663#endif 1221#endif
664 return newSVsv (cbor_true); 1222 return newSVsv (types_true);
665 case 22: 1223 case SIMPLE_NULL:
666 return newSVsv (&PL_sv_undef); 1224 return newSVsv (&PL_sv_undef);
1225 case SIMPLE_UNDEF:
1226#if CBOR_SLOW
1227 types_error = get_bool ("Types::Serialiser::error");
1228#endif
1229 return newSVsv (types_error);
667 1230
668 case 25: 1231 case MISC_FLOAT16:
669 { 1232 {
670 WANT (2); 1233 WANT (2);
671 1234
672 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1235 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
673 dec->cur += 2; 1236 dec->cur += 2;
674 1237
675 return newSVnv (ecb_binary16_to_float (fp)); 1238 return newSVnv (ecb_binary16_to_float (fp));
676 } 1239 }
677 1240
678 case 26: 1241 case MISC_FLOAT32:
679 { 1242 {
680 uint32_t fp; 1243 uint32_t fp;
681 WANT (4); 1244 WANT (4);
682 memcpy (&fp, dec->cur, 4); 1245 memcpy (&fp, dec->cur, 4);
683 dec->cur += 4; 1246 dec->cur += 4;
686 fp = ecb_bswap32 (fp); 1249 fp = ecb_bswap32 (fp);
687 1250
688 return newSVnv (ecb_binary32_to_float (fp)); 1251 return newSVnv (ecb_binary32_to_float (fp));
689 } 1252 }
690 1253
691 case 27: 1254 case MISC_FLOAT64:
692 { 1255 {
693 uint64_t fp; 1256 uint64_t fp;
694 WANT (8); 1257 WANT (8);
695 memcpy (&fp, dec->cur, 8); 1258 memcpy (&fp, dec->cur, 8);
696 dec->cur += 8; 1259 dec->cur += 8;
699 fp = ecb_bswap64 (fp); 1262 fp = ecb_bswap64 (fp);
700 1263
701 return newSVnv (ecb_binary64_to_double (fp)); 1264 return newSVnv (ecb_binary64_to_double (fp));
702 } 1265 }
703 1266
704 // 0..19 unassigned 1267 // 0..19 unassigned simple
705 // 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
706 default: 1271 default:
707 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1272 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
708 } 1273 }
709 1274
710 break; 1275 break;
711 } 1276 }
712 1277
715} 1280}
716 1281
717static SV * 1282static SV *
718decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1283decode_cbor (SV *string, CBOR *cbor, char **offset_return)
719{ 1284{
720 dec_t dec; 1285 dec_t dec = { 0 };
721 SV *sv; 1286 SV *sv;
1287 STRLEN len;
1288 char *data = SvPVbyte (string, len);
722 1289
723 /* work around bugs in 5.10 where manipulating magic values
724 * makes perl ignore the magic in subsequent accesses.
725 * also make a copy of non-PV values, to get them into a clean
726 * state (SvPV should do that, but it's buggy, see below).
727 */
728 /*SvGETMAGIC (string);*/
729 if (SvMAGICAL (string) || !SvPOK (string))
730 string = sv_2mortal (newSVsv (string));
731
732 SvUPGRADE (string, SVt_PV);
733
734 /* work around a bug in perl 5.10, which causes SvCUR to fail an
735 * assertion with -DDEBUGGING, although SvCUR is documented to
736 * return the xpv_cur field which certainly exists after upgrading.
737 * according to nicholas clark, calling SvPOK fixes this.
738 * But it doesn't fix it, so try another workaround, call SvPV_nolen
739 * and hope for the best.
740 * Damnit, SvPV_nolen still trips over yet another assertion. This
741 * assertion business is seriously broken, try yet another workaround
742 * for the broken -DDEBUGGING.
743 */
744 {
745#ifdef DEBUGGING
746 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
747#else
748 STRLEN offset = SvCUR (string);
749#endif
750
751 if (offset > cbor->max_size && cbor->max_size) 1290 if (len > cbor->max_size && cbor->max_size)
752 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu", 1291 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
753 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 1292 (unsigned long)len, (unsigned long)cbor->max_size);
754 }
755
756 sv_utf8_downgrade (string, 0);
757 1293
758 dec.cbor = *cbor; 1294 dec.cbor = *cbor;
759 dec.cur = (U8 *)SvPVX (string); 1295 dec.cur = (U8 *)data;
760 dec.end = (U8 *)SvEND (string); 1296 dec.end = (U8 *)data + len;
761 dec.err = 0;
762 dec.depth = 0;
763 1297
764 sv = decode_sv (&dec); 1298 sv = decode_sv (&dec);
765 1299
766 if (offset_return) 1300 if (offset_return)
767 *offset_return = dec.cur; 1301 *offset_return = dec.cur;
770 if (dec.cur != dec.end && !dec.err) 1304 if (dec.cur != dec.end && !dec.err)
771 dec.err = "garbage after CBOR object"; 1305 dec.err = "garbage after CBOR object";
772 1306
773 if (dec.err) 1307 if (dec.err)
774 { 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
775 SvREFCNT_dec (sv); 1320 SvREFCNT_dec_NN (sv);
1321
1322 if (dec.err_sv)
1323 sv_2mortal (dec.err_sv);
1324
776 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (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);
777 } 1326 }
778 1327
779 sv = sv_2mortal (sv); 1328 sv = sv_2mortal (sv);
780 1329
781 return sv; 1330 return sv;
782} 1331}
783 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
784///////////////////////////////////////////////////////////////////////////// 1457/////////////////////////////////////////////////////////////////////////////
785// XS interface functions 1458// XS interface functions
786 1459
787MODULE = CBOR::XS PACKAGE = CBOR::XS 1460MODULE = CBOR::XS PACKAGE = CBOR::XS
788 1461
789BOOT: 1462BOOT:
790{ 1463{
791 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 1464 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
792 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
793 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1); 1465 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
794 1466
795 cbor_true = get_bool ("CBOR::XS::true"); 1467 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
796 cbor_false = get_bool ("CBOR::XS::false"); 1468 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
1469
1470 types_true = get_bool ("Types::Serialiser::true" );
1471 types_false = get_bool ("Types::Serialiser::false");
1472 types_error = get_bool ("Types::Serialiser::error");
1473
1474 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1475
1476 sv_cbor = newSVpv ("CBOR", 0);
1477 SvREADONLY_on (sv_cbor);
1478
1479 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
797} 1480}
798 1481
799PROTOTYPES: DISABLE 1482PROTOTYPES: DISABLE
800 1483
801void CLONE (...) 1484void CLONE (...)
802 CODE: 1485 CODE:
803 cbor_stash = 0; 1486 cbor_stash = 0;
804 cbor_boolean_stash = 0;
805 cbor_tagged_stash = 0; 1487 cbor_tagged_stash = 0;
1488 types_error_stash = 0;
1489 types_boolean_stash = 0;
806 1490
807void new (char *klass) 1491void new (char *klass)
808 PPCODE: 1492 PPCODE:
809{ 1493{
810 SV *pv = NEWSV (0, sizeof (CBOR)); 1494 SV *pv = NEWSV (0, sizeof (CBOR));
818 1502
819void shrink (CBOR *self, int enable = 1) 1503void shrink (CBOR *self, int enable = 1)
820 ALIAS: 1504 ALIAS:
821 shrink = F_SHRINK 1505 shrink = F_SHRINK
822 allow_unknown = F_ALLOW_UNKNOWN 1506 allow_unknown = F_ALLOW_UNKNOWN
1507 allow_sharing = F_ALLOW_SHARING
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
823 PPCODE: 1514 PPCODE:
824{ 1515{
825 if (enable) 1516 if (enable)
826 self->flags |= ix; 1517 self->flags |= ix;
827 else 1518 else
832 1523
833void get_shrink (CBOR *self) 1524void get_shrink (CBOR *self)
834 ALIAS: 1525 ALIAS:
835 get_shrink = F_SHRINK 1526 get_shrink = F_SHRINK
836 get_allow_unknown = F_ALLOW_UNKNOWN 1527 get_allow_unknown = F_ALLOW_UNKNOWN
1528 get_allow_sharing = F_ALLOW_SHARING
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
837 PPCODE: 1535 PPCODE:
838 XPUSHs (boolSV (self->flags & ix)); 1536 XPUSHs (boolSV (self->flags & ix));
839 1537
840void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1538void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
841 PPCODE: 1539 PPCODE:
857 CODE: 1555 CODE:
858 RETVAL = self->max_size; 1556 RETVAL = self->max_size;
859 OUTPUT: 1557 OUTPUT:
860 RETVAL 1558 RETVAL
861 1559
862#if 0 //TODO 1560void filter (CBOR *self, SV *filter = 0)
863
864void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
865 PPCODE: 1561 PPCODE:
866{
867 SvREFCNT_dec (self->cb_object); 1562 SvREFCNT_dec (self->filter);
868 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0; 1563 self->filter = filter ? newSVsv (filter) : filter;
869
870 XPUSHs (ST (0)); 1564 XPUSHs (ST (0));
871}
872 1565
873void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef) 1566SV *get_filter (CBOR *self)
874 PPCODE: 1567 CODE:
875{ 1568 RETVAL = self->filter ? self->filter : NEWSV (0, 0);
876 if (!self->cb_sk_object) 1569 OUTPUT:
877 self->cb_sk_object = newHV (); 1570 RETVAL
878
879 if (SvOK (cb))
880 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
881 else
882 {
883 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
884
885 if (!HvKEYS (self->cb_sk_object))
886 {
887 SvREFCNT_dec (self->cb_sk_object);
888 self->cb_sk_object = 0;
889 }
890 }
891
892 XPUSHs (ST (0));
893}
894
895#endif
896 1571
897void encode (CBOR *self, SV *scalar) 1572void encode (CBOR *self, SV *scalar)
898 PPCODE: 1573 PPCODE:
899 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1574 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
900 XPUSHs (scalar); 1575 XPUSHs (scalar);
913 EXTEND (SP, 2); 1588 EXTEND (SP, 2);
914 PUSHs (sv); 1589 PUSHs (sv);
915 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1590 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
916} 1591}
917 1592
918#if 0 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}
919 1644
920void DESTROY (CBOR *self) 1645void DESTROY (CBOR *self)
921 CODE: 1646 PPCODE:
922 SvREFCNT_dec (self->cb_sk_object); 1647 cbor_free (self);
923 SvREFCNT_dec (self->cb_object);
924
925#endif
926 1648
927PROTOTYPES: ENABLE 1649PROTOTYPES: ENABLE
928 1650
929void encode_cbor (SV *scalar) 1651void encode_cbor (SV *scalar)
1652 ALIAS:
1653 encode_cbor = 0
1654 encode_cbor_sharing = F_ALLOW_SHARING
930 PPCODE: 1655 PPCODE:
931{ 1656{
932 CBOR cbor; 1657 CBOR cbor;
933 cbor_init (&cbor); 1658 cbor_init (&cbor);
1659 cbor.flags |= ix;
934 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1660 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
935 XPUSHs (scalar); 1661 XPUSHs (scalar);
936} 1662}
937 1663
938void decode_cbor (SV *cborstr) 1664void decode_cbor (SV *cborstr)
942 cbor_init (&cbor); 1668 cbor_init (&cbor);
943 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1669 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
944 XPUSHs (cborstr); 1670 XPUSHs (cborstr);
945} 1671}
946 1672
1673#ifdef __AFL_COMPILER
1674
1675void
1676afl_init ()
1677 CODE:
1678 __AFL_INIT ();
1679
1680int
1681afl_loop (unsigned int count = 10000)
1682 CODE:
1683 RETVAL = __AFL_LOOP (count);
1684 OUTPUT:
1685 RETVAL
1686
1687#endif
1688

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines