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.65 by root, Thu Nov 15 19:52:41 2018 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;
509 }
510 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
511 {
512 dSP;
513
514 ENTER; SAVETMPS;
515 PUSHMARK (SP);
516 EXTEND (SP, 2);
517 // we re-bless the reference to get overload and other niceties right
518 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
519 PUSHs (sv_cbor);
520
521 PUTBACK;
522 int count = call_sv ((SV *)GvCV (method), G_ARRAY);
523 SPAGAIN;
524
525 // catch this surprisingly common error
526 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
527 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
528
529 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
530 encode_uint (enc, MAJOR_ARRAY, count + 1);
531 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
532
533 {
534 int i;
535
536 for (i = 0; i < count; ++i)
537 encode_sv (enc, SP[i + 1 - count]);
538
539 SP -= count;
279 } 540 }
541
542 PUTBACK;
543
544 FREETMPS; LEAVE;
545 }
280 else 546 else
281 croak ("encountered object '%s', but no TO_CBOR method available on it", 547 croak ("encountered object '%s', but no TO_CBOR or FREEZE methods available on it",
282 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 548 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
283 }
284 } 549 }
285 else if (svt == SVt_PVHV) 550 else if (svt == SVt_PVHV)
286 encode_hv (enc, (HV *)sv); 551 encode_hv (enc, (HV *)sv);
287 else if (svt == SVt_PVAV) 552 else if (svt == SVt_PVAV)
288 encode_av (enc, (AV *)sv); 553 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 554 else
307 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 555 {
308 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 556 encode_tag (enc, CBOR_TAG_INDIRECTION);
557 encode_sv (enc, sv);
558 }
309} 559}
310 560
311static void 561static void
312encode_nv (enc_t *enc, SV *sv) 562encode_nv (enc_t *enc, SV *sv)
313{ 563{
314 double nv = SvNVX (sv); 564 double nv = SvNVX (sv);
315 565
316 need (enc, 9); 566 need (enc, 9);
317 567
318 if (ecb_expect_false (nv == (U32)nv)) 568 if (ecb_expect_false (nv == (NV)(U32)nv))
319 encode_uint (enc, 0x00, (U32)nv); 569 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
320 //TODO: maybe I32? 570 //TODO: maybe I32?
321 else if (ecb_expect_false (nv == (float)nv)) 571 else if (ecb_expect_false (nv == (float)nv))
322 { 572 {
573 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
574
323 uint32_t fp = ecb_float_to_binary32 (nv); 575 uint32_t fp = ecb_float_to_binary32 (nv);
324
325 *enc->cur++ = 0xe0 | 26;
326 576
327 if (!ecb_big_endian ()) 577 if (!ecb_big_endian ())
328 fp = ecb_bswap32 (fp); 578 fp = ecb_bswap32 (fp);
329 579
330 memcpy (enc->cur, &fp, 4); 580 memcpy (enc->cur, &fp, 4);
331 enc->cur += 4; 581 enc->cur += 4;
332 } 582 }
333 else 583 else
334 { 584 {
585 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
586
335 uint64_t fp = ecb_double_to_binary64 (nv); 587 uint64_t fp = ecb_double_to_binary64 (nv);
336
337 *enc->cur++ = 0xe0 | 27;
338 588
339 if (!ecb_big_endian ()) 589 if (!ecb_big_endian ())
340 fp = ecb_bswap64 (fp); 590 fp = ecb_bswap64 (fp);
341 591
342 memcpy (enc->cur, &fp, 8); 592 memcpy (enc->cur, &fp, 8);
351 601
352 if (SvPOKp (sv)) 602 if (SvPOKp (sv))
353 { 603 {
354 STRLEN len; 604 STRLEN len;
355 char *str = SvPV (sv, len); 605 char *str = SvPV (sv, len);
356 encode_str (enc, SvUTF8 (sv), str, len); 606 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
357 } 607 }
358 else if (SvNOKp (sv)) 608 else if (SvNOKp (sv))
359 encode_nv (enc, sv); 609 encode_nv (enc, sv);
360 else if (SvIOKp (sv)) 610 else if (SvIOKp (sv))
361 { 611 {
362 if (SvIsUV (sv)) 612 if (SvIsUV (sv))
363 encode_uint (enc, 0x00, SvUVX (sv)); 613 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
364 else if (SvIVX (sv) >= 0) 614 else if (SvIVX (sv) >= 0)
365 encode_uint (enc, 0x00, SvIVX (sv)); 615 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
366 else 616 else
367 encode_uint (enc, 0x20, -(SvIVX (sv) + 1)); 617 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
368 } 618 }
369 else if (SvROK (sv)) 619 else if (SvROK (sv))
370 encode_rv (enc, SvRV (sv)); 620 encode_rv (enc, SvRV (sv));
371 else if (!SvOK (sv)) 621 else if (!SvOK (sv))
372 encode_ch (enc, 0xe0 | 22); 622 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
373 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 623 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
374 encode_ch (enc, 0xe0 | 23); 624 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
375 else 625 else
376 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data", 626 croak ("encountered perl type (%s,0x%x) that CBOR cannot handle, check your input data",
377 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 627 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
378} 628}
379 629
380static SV * 630static SV *
381encode_cbor (SV *scalar, CBOR *cbor) 631encode_cbor (SV *scalar, CBOR *cbor)
382{ 632{
383 enc_t enc; 633 enc_t enc = { 0 };
384 634
385 enc.cbor = *cbor; 635 enc.cbor = *cbor;
386 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 636 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
387 enc.cur = SvPVX (enc.sv); 637 enc.cur = SvPVX (enc.sv);
388 enc.end = SvEND (enc.sv); 638 enc.end = SvEND (enc.sv);
389 enc.depth = 0;
390 639
391 SvPOK_only (enc.sv); 640 SvPOK_only (enc.sv);
641
642 if (cbor->flags & F_PACK_STRINGS)
643 {
644 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
645 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
646 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
647 }
648
392 encode_sv (&enc, scalar); 649 encode_sv (&enc, scalar);
393 650
394 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 651 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
395 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings 652 *SvEND (enc.sv) = 0; // many xs functions expect a trailing 0 for text strings
396 653
410 U8 *end; // end of input string 667 U8 *end; // end of input string
411 const char *err; // parse error, if != 0 668 const char *err; // parse error, if != 0
412 CBOR cbor; 669 CBOR cbor;
413 U32 depth; // recursion depth 670 U32 depth; // recursion depth
414 U32 maxdepth; // recursion depth limit 671 U32 maxdepth; // recursion depth limit
672 AV *shareable;
673 AV *stringref;
674 SV *decode_tagged;
675 SV *err_sv; // optional sv for error, needs to be freed
415} dec_t; 676} dec_t;
416 677
417#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 678// set dec->err to ERRSV
679ecb_cold static void
680err_errsv (dec_t *dec)
681{
682 if (!dec->err)
683 {
684 dec->err_sv = newSVsv (ERRSV);
418 685
419#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 686 // chop off the trailing \n
687 SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1);
688 *SvEND (dec->err_sv) = 0;
420 689
690 dec->err = SvPVutf8_nolen (dec->err_sv);
691 }
692}
693
694// the following functions are used to reduce code size and help the compiler to optimise
695ecb_cold static void
696err_set (dec_t *dec, const char *reason)
697{
698 if (!dec->err)
699 dec->err = reason;
700}
701
702ecb_cold static void
703err_unexpected_end (dec_t *dec)
704{
705 err_set (dec, "unexpected end of CBOR data");
706}
707
708#define ERR_DO(do) SB do; goto fail; SE
709#define ERR(reason) ERR_DO (err_set (dec, reason))
710#define ERR_ERRSV ERR_DO (err_errsv (dec))
711
712#define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec))
713
421#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 714#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 715#define DEC_DEC_DEPTH --dec->depth
423 716
424static UV 717static UV
425decode_uint (dec_t *dec) 718decode_uint (dec_t *dec)
426{ 719{
427 switch (*dec->cur & 31) 720 U8 m = *dec->cur & MINOR_MASK;
428 { 721 ++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 722
434 case 24: 723 if (ecb_expect_true (m < LENGTH_EXT1))
724 return m;
725 else if (ecb_expect_true (m == LENGTH_EXT1))
726 {
435 WANT (2); 727 WANT (1);
436 dec->cur += 2; 728 dec->cur += 1;
437 return dec->cur[-1]; 729 return dec->cur[-1];
438 730 }
439 case 25: 731 else if (ecb_expect_true (m == LENGTH_EXT2))
732 {
440 WANT (3); 733 WANT (2);
441 dec->cur += 3; 734 dec->cur += 2;
442 return (((UV)dec->cur[-2]) << 8) 735 return (((UV)dec->cur[-2]) << 8)
443 | ((UV)dec->cur[-1]); 736 | ((UV)dec->cur[-1]);
444 737 }
445 case 26: 738 else if (ecb_expect_true (m == LENGTH_EXT4))
739 {
446 WANT (5); 740 WANT (4);
447 dec->cur += 5; 741 dec->cur += 4;
448 return (((UV)dec->cur[-4]) << 24) 742 return (((UV)dec->cur[-4]) << 24)
449 | (((UV)dec->cur[-3]) << 16) 743 | (((UV)dec->cur[-3]) << 16)
450 | (((UV)dec->cur[-2]) << 8) 744 | (((UV)dec->cur[-2]) << 8)
451 | ((UV)dec->cur[-1]); 745 | ((UV)dec->cur[-1]);
452 746 }
453 case 27: 747 else if (ecb_expect_true (m == LENGTH_EXT8))
748 {
454 WANT (9); 749 WANT (8);
455 dec->cur += 9; 750 dec->cur += 8;
751
752 return
753#if UVSIZE < 8
754 0
755#else
456 return (((UV)dec->cur[-8]) << 56) 756 (((UV)dec->cur[-8]) << 56)
457 | (((UV)dec->cur[-7]) << 48) 757 | (((UV)dec->cur[-7]) << 48)
458 | (((UV)dec->cur[-6]) << 40) 758 | (((UV)dec->cur[-6]) << 40)
459 | (((UV)dec->cur[-5]) << 32) 759 | (((UV)dec->cur[-5]) << 32)
760#endif
460 | (((UV)dec->cur[-4]) << 24) 761 | (((UV)dec->cur[-4]) << 24)
461 | (((UV)dec->cur[-3]) << 16) 762 | (((UV)dec->cur[-3]) << 16)
462 | (((UV)dec->cur[-2]) << 8) 763 | (((UV)dec->cur[-2]) << 8)
463 | ((UV)dec->cur[-1]); 764 | ((UV)dec->cur[-1]);
464 765 }
465 default: 766 else
466 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 767 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
467 }
468 768
469fail: 769fail:
470 return 0; 770 return 0;
471} 771}
472 772
477{ 777{
478 AV *av = newAV (); 778 AV *av = newAV ();
479 779
480 DEC_INC_DEPTH; 780 DEC_INC_DEPTH;
481 781
482 if ((*dec->cur & 31) == 31) 782 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
483 { 783 {
484 ++dec->cur; 784 ++dec->cur;
485 785
486 for (;;) 786 for (;;)
487 { 787 {
488 WANT (1); 788 WANT (1);
489 789
490 if (*dec->cur == (0xe0 | 31)) 790 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
491 { 791 {
492 ++dec->cur; 792 ++dec->cur;
493 break; 793 break;
494 } 794 }
495 795
496 av_push (av, decode_sv (dec)); 796 av_push (av, decode_sv (dec));
497 } 797 }
498 } 798 }
499 else 799 else
500 { 800 {
501 int i, len = decode_uint (dec); 801 UV i, len = decode_uint (dec);
502 802
803 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); 804 av_fill (av, len - 1);
504 805
505 for (i = 0; i < len; ++i) 806 for (i = 0; i < len; ++i)
506 AvARRAY (av)[i] = decode_sv (dec); 807 AvARRAY (av)[i] = decode_sv (dec);
507 } 808 }
508 809
509 DEC_DEC_DEPTH; 810 DEC_DEC_DEPTH;
510 return newRV_noinc ((SV *)av); 811 return newRV_noinc ((SV *)av);
511 812
512fail: 813fail:
513 SvREFCNT_dec (av); 814 SvREFCNT_dec_NN (av);
514 DEC_DEC_DEPTH; 815 DEC_DEC_DEPTH;
515 return &PL_sv_undef; 816 return &PL_sv_undef;
516} 817}
517 818
819static void
820decode_he (dec_t *dec, HV *hv)
821{
822 // for speed reasons, we specialcase single-string
823 // byte or utf-8 strings as keys, but only when !stringref
824
825 if (ecb_expect_true (!dec->stringref))
826 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
827 {
828 STRLEN len = decode_uint (dec);
829 char *key = (char *)dec->cur;
830
831 WANT (len);
832 dec->cur += len;
833
834 hv_store (hv, key, len, decode_sv (dec), 0);
835
836 return;
837 }
838 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
839 {
840 STRLEN len = decode_uint (dec);
841 char *key = (char *)dec->cur;
842
843 WANT (len);
844 dec->cur += len;
845
846 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
847 if (!is_utf8_string (key, len))
848 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
849
850 hv_store (hv, key, -len, decode_sv (dec), 0);
851
852 return;
853 }
854
855 SV *k = decode_sv (dec);
856 SV *v = decode_sv (dec);
857
858 // we leak memory if uncaught exceptions are thrown by random magical
859 // methods, and this is hopefully the only place where it can happen,
860 // so if there is a chance of an exception, take the very slow path.
861 // since catching exceptions is "undocumented/internal/forbidden" by
862 // the new p5p powers, we need to call out to a perl function :/
863 if (ecb_expect_false (SvAMAGIC (k)))
864 {
865 dSP;
866
867 ENTER; SAVETMPS;
868 PUSHMARK (SP);
869 EXTEND (SP, 3);
870 PUSHs (sv_2mortal (newRV_inc ((SV *)hv)));
871 PUSHs (sv_2mortal (k));
872 PUSHs (sv_2mortal (v));
873
874 PUTBACK;
875 call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL);
876 SPAGAIN;
877
878 FREETMPS; LEAVE;
879
880 if (SvTRUE (ERRSV))
881 ERR_ERRSV;
882
883 return;
884 }
885
886 hv_store_ent (hv, k, v, 0);
887 SvREFCNT_dec_NN (k);
888
889fail:
890 ;
891}
892
518static SV * 893static SV *
519decode_hv (dec_t *dec) 894decode_hv (dec_t *dec)
520{ 895{
521 HV *hv = newHV (); 896 HV *hv = newHV ();
522 897
523 DEC_INC_DEPTH; 898 DEC_INC_DEPTH;
524 899
525 if ((*dec->cur & 31) == 31) 900 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
526 { 901 {
527 ++dec->cur; 902 ++dec->cur;
528 903
529 for (;;) 904 for (;;)
530 { 905 {
531 WANT (1); 906 WANT (1);
532 907
533 if (*dec->cur == (0xe0 | 31)) 908 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
534 { 909 {
535 ++dec->cur; 910 ++dec->cur;
536 break; 911 break;
537 } 912 }
538 913
539 SV *k = decode_sv (dec); 914 decode_he (dec, hv);
540 SV *v = decode_sv (dec);
541
542 hv_store_ent (hv, k, v, 0);
543 } 915 }
544 } 916 }
545 else 917 else
546 { 918 {
547 int len = decode_uint (dec); 919 UV pairs = decode_uint (dec);
548 920
921 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
922
549 while (len--) 923 while (pairs--)
550 { 924 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 } 925 }
557 926
558 DEC_DEC_DEPTH; 927 DEC_DEC_DEPTH;
559 return newRV_noinc ((SV *)hv); 928 return newRV_noinc ((SV *)hv);
560 929
561fail: 930fail:
562 SvREFCNT_dec (hv); 931 SvREFCNT_dec_NN (hv);
563 DEC_DEC_DEPTH; 932 DEC_DEC_DEPTH;
564 return &PL_sv_undef; 933 return &PL_sv_undef;
565} 934}
566 935
567static SV * 936static SV *
568decode_str (dec_t *dec, int utf8) 937decode_str (dec_t *dec, int utf8)
569{ 938{
570 SV *sv = 0; 939 SV *sv = 0;
571 940
572 if ((*dec->cur & 31) == 31) 941 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
573 { 942 {
943 // indefinite length strings
574 ++dec->cur; 944 ++dec->cur;
575 945
946 U8 major = *dec->cur & MAJOR_MISC;
947
576 sv = newSVpvn ("", 0); 948 sv = newSVpvn ("", 0);
577 949
578 // not very fast, and certainly not robust against illegal input
579 for (;;) 950 for (;;)
580 { 951 {
581 WANT (1); 952 WANT (1);
582 953
583 if (*dec->cur == (0xe0 | 31)) 954 if ((*dec->cur - major) > LENGTH_EXT8)
955 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
584 { 956 {
585 ++dec->cur; 957 ++dec->cur;
586 break; 958 break;
587 } 959 }
960 else
961 ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
588 962
589 sv_catsv (sv, decode_sv (dec)); 963 STRLEN len = decode_uint (dec);
964
965 WANT (len);
966 sv_catpvn (sv, dec->cur, len);
967 dec->cur += len;
590 } 968 }
591 } 969 }
592 else 970 else
593 { 971 {
594 STRLEN len = decode_uint (dec); 972 STRLEN len = decode_uint (dec);
595 973
596 WANT (len); 974 WANT (len);
597 sv = newSVpvn (dec->cur, len); 975 sv = newSVpvn (dec->cur, len);
598 dec->cur += len; 976 dec->cur += len;
977
978 if (ecb_expect_false (dec->stringref)
979 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
980 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
599 } 981 }
600 982
601 if (utf8) 983 if (utf8)
984 {
985 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
986 if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
987 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
988
602 SvUTF8_on (sv); 989 SvUTF8_on (sv);
990 }
603 991
604 return sv; 992 return sv;
605 993
606fail: 994fail:
607 SvREFCNT_dec (sv); 995 SvREFCNT_dec (sv);
609} 997}
610 998
611static SV * 999static SV *
612decode_tagged (dec_t *dec) 1000decode_tagged (dec_t *dec)
613{ 1001{
1002 SV *sv = 0;
614 UV tag = decode_uint (dec); 1003 UV tag = decode_uint (dec);
1004
1005 WANT (1);
1006
1007 switch (tag)
1008 {
1009 case CBOR_TAG_MAGIC:
615 SV *sv = decode_sv (dec); 1010 sv = decode_sv (dec);
1011 break;
616 1012
617 if (tag == 55799) // 2.4.5 Self-Describe CBOR 1013 case CBOR_TAG_INDIRECTION:
1014 sv = newRV_noinc (decode_sv (dec));
1015 break;
1016
1017 case CBOR_TAG_STRINGREF_NAMESPACE:
1018 {
1019 // do not use SAVETMPS/FREETMPS, as these will
1020 // erase mortalised caches, e.g. "shareable"
1021 ENTER;
1022
1023 SAVESPTR (dec->stringref);
1024 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
1025
1026 sv = decode_sv (dec);
1027
1028 LEAVE;
1029 }
1030 break;
1031
1032 case CBOR_TAG_STRINGREF:
1033 {
1034 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1035 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
1036
1037 UV idx = decode_uint (dec);
1038
1039 if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref)))
1040 ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)");
1041
1042 sv = newSVsv (AvARRAY (dec->stringref)[idx]);
1043 }
1044 break;
1045
1046 case CBOR_TAG_VALUE_SHAREABLE:
1047 {
1048 if (ecb_expect_false (!dec->shareable))
1049 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
1050
1051 if (dec->cbor.flags & F_ALLOW_CYCLES)
1052 {
1053 sv = newSV (0);
1054 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
1055
1056 SV *osv = decode_sv (dec);
1057 sv_setsv (sv, osv);
1058 SvREFCNT_dec_NN (osv);
1059 }
1060 else
1061 {
1062 av_push (dec->shareable, &PL_sv_undef);
1063 int idx = AvFILLp (dec->shareable);
1064 sv = decode_sv (dec);
1065 av_store (dec->shareable, idx, SvREFCNT_inc_NN (sv));
1066 }
1067 }
1068 break;
1069
1070 case CBOR_TAG_VALUE_SHAREDREF:
1071 {
1072 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
1073 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
1074
1075 UV idx = decode_uint (dec);
1076
1077 if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable)))
1078 ERR ("corrupted CBOR data (sharedref index out of bounds)");
1079
1080 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]);
1081
1082 if (sv == &PL_sv_undef)
1083 ERR ("cyclic CBOR data structure found, but allow_cycles is not enabled");
1084 }
1085 break;
1086
1087 case CBOR_TAG_PERL_OBJECT:
1088 {
1089 if (dec->cbor.flags & F_FORBID_OBJECTS)
1090 goto filter;
1091
1092 sv = decode_sv (dec);
1093
1094 if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV)
1095 ERR ("corrupted CBOR data (non-array perl object)");
1096
1097 AV *av = (AV *)SvRV (sv);
1098 int len = av_len (av) + 1;
1099 HV *stash = gv_stashsv (*av_fetch (av, 0, 1), 0);
1100
1101 if (!stash)
1102 ERR ("cannot decode perl-object (package does not exist)");
1103
1104 GV *method = gv_fetchmethod_autoload (stash, "THAW", 0);
1105
1106 if (!method)
1107 ERR ("cannot decode perl-object (package does not have a THAW method)");
1108
1109 dSP;
1110
1111 ENTER; SAVETMPS;
1112 PUSHMARK (SP);
1113 EXTEND (SP, len + 1);
1114 // we re-bless the reference to get overload and other niceties right
1115 PUSHs (*av_fetch (av, 0, 1));
1116 PUSHs (sv_cbor);
1117
1118 int i;
1119
1120 for (i = 1; i < len; ++i)
1121 PUSHs (*av_fetch (av, i, 1));
1122
1123 PUTBACK;
1124 call_sv ((SV *)GvCV (method), G_SCALAR | G_EVAL);
1125 SPAGAIN;
1126
1127 if (SvTRUE (ERRSV))
1128 {
1129 FREETMPS; LEAVE;
1130 ERR_ERRSV;
1131 }
1132
1133 SvREFCNT_dec_NN (sv);
1134 sv = SvREFCNT_inc (POPs);
1135
1136 PUTBACK;
1137
1138 FREETMPS; LEAVE;
1139 }
1140 break;
1141
1142 default:
1143 filter:
1144 {
1145 SV *tag_sv = newSVuv (tag);
1146
1147 sv = decode_sv (dec);
1148
1149 dSP;
1150 ENTER; SAVETMPS;
1151 PUSHMARK (SP);
1152 EXTEND (SP, 2);
1153 PUSHs (tag_sv);
1154 PUSHs (sv);
1155
1156 PUTBACK;
1157 int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL);
1158 SPAGAIN;
1159
1160 if (SvTRUE (ERRSV))
1161 {
1162 SvREFCNT_dec_NN (tag_sv);
1163 FREETMPS; LEAVE;
1164 ERR_ERRSV;
1165 }
1166
1167 if (count)
1168 {
1169 SvREFCNT_dec_NN (tag_sv);
1170 SvREFCNT_dec_NN (sv);
1171 sv = SvREFCNT_inc_NN (TOPs);
1172 SP -= count;
1173 }
1174 else
1175 {
1176 AV *av = newAV ();
1177 av_push (av, tag_sv);
1178 av_push (av, sv);
1179
1180 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
1181 ? cbor_tagged_stash
1182 : gv_stashpv ("CBOR::XS::Tagged" , 1);
1183 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
1184 }
1185
1186 PUTBACK;
1187
1188 FREETMPS; LEAVE;
1189 }
1190 break;
1191 }
1192
618 return sv; 1193 return sv;
619 1194
620 AV *av = newAV (); 1195fail:
621 av_push (av, newSVuv (tag)); 1196 SvREFCNT_dec (sv);
622 av_push (av, sv); 1197 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} 1198}
630 1199
631static SV * 1200static SV *
632decode_sv (dec_t *dec) 1201decode_sv (dec_t *dec)
633{ 1202{
634 WANT (1); 1203 WANT (1);
635 1204
636 switch (*dec->cur >> 5) 1205 switch (*dec->cur >> MAJOR_SHIFT)
637 { 1206 {
638 case 0: // unsigned int 1207 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
639 return newSVuv (decode_uint (dec)); 1208 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
640 case 1: // negative int 1209 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
641 return newSViv (-1 - (IV)decode_uint (dec)); 1210 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
642 case 2: // octet string 1211 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
643 return decode_str (dec, 0); 1212 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
644 case 3: // utf-8 string 1213 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
645 return decode_str (dec, 1); 1214
646 case 4: // array 1215 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) 1216 switch (*dec->cur++ & MINOR_MASK)
654 { 1217 {
655 case 20: 1218 case SIMPLE_FALSE:
656#if CBOR_SLOW 1219#if CBOR_SLOW
657 cbor_false = get_bool ("CBOR::XS::false"); 1220 types_false = get_bool ("Types::Serialiser::false");
658#endif 1221#endif
659 return newSVsv (cbor_false); 1222 return newSVsv (types_false);
660 case 21: 1223 case SIMPLE_TRUE:
661#if CBOR_SLOW 1224#if CBOR_SLOW
662 cbor_true = get_bool ("CBOR::XS::true"); 1225 types_true = get_bool ("Types::Serialiser::true");
663#endif 1226#endif
664 return newSVsv (cbor_true); 1227 return newSVsv (types_true);
665 case 22: 1228 case SIMPLE_NULL:
666 return newSVsv (&PL_sv_undef); 1229 return newSVsv (&PL_sv_undef);
1230 case SIMPLE_UNDEF:
1231#if CBOR_SLOW
1232 types_error = get_bool ("Types::Serialiser::error");
1233#endif
1234 return newSVsv (types_error);
667 1235
668 case 25: 1236 case MISC_FLOAT16:
669 { 1237 {
670 WANT (2); 1238 WANT (2);
671 1239
672 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1240 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
673 dec->cur += 2; 1241 dec->cur += 2;
674 1242
675 return newSVnv (ecb_binary16_to_float (fp)); 1243 return newSVnv (ecb_binary16_to_float (fp));
676 } 1244 }
677 1245
678 case 26: 1246 case MISC_FLOAT32:
679 { 1247 {
680 uint32_t fp; 1248 uint32_t fp;
681 WANT (4); 1249 WANT (4);
682 memcpy (&fp, dec->cur, 4); 1250 memcpy (&fp, dec->cur, 4);
683 dec->cur += 4; 1251 dec->cur += 4;
686 fp = ecb_bswap32 (fp); 1254 fp = ecb_bswap32 (fp);
687 1255
688 return newSVnv (ecb_binary32_to_float (fp)); 1256 return newSVnv (ecb_binary32_to_float (fp));
689 } 1257 }
690 1258
691 case 27: 1259 case MISC_FLOAT64:
692 { 1260 {
693 uint64_t fp; 1261 uint64_t fp;
694 WANT (8); 1262 WANT (8);
695 memcpy (&fp, dec->cur, 8); 1263 memcpy (&fp, dec->cur, 8);
696 dec->cur += 8; 1264 dec->cur += 8;
699 fp = ecb_bswap64 (fp); 1267 fp = ecb_bswap64 (fp);
700 1268
701 return newSVnv (ecb_binary64_to_double (fp)); 1269 return newSVnv (ecb_binary64_to_double (fp));
702 } 1270 }
703 1271
704 // 0..19 unassigned 1272 // 0..19 unassigned simple
705 // 24 reserved + unassigned (reserved values are not encodable) 1273 // 24 reserved + unassigned simple (reserved values are not encodable)
1274 // 28-30 unassigned misc
1275 // 31 break code
706 default: 1276 default:
707 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1277 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
708 } 1278 }
709 1279
710 break; 1280 break;
711 } 1281 }
712 1282
715} 1285}
716 1286
717static SV * 1287static SV *
718decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1288decode_cbor (SV *string, CBOR *cbor, char **offset_return)
719{ 1289{
720 dec_t dec; 1290 dec_t dec = { 0 };
721 SV *sv; 1291 SV *sv;
1292 STRLEN len;
1293 char *data = SvPVbyte (string, len);
722 1294
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) 1295 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", 1296 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); 1297 (unsigned long)len, (unsigned long)cbor->max_size);
754 }
755
756 sv_utf8_downgrade (string, 0);
757 1298
758 dec.cbor = *cbor; 1299 dec.cbor = *cbor;
759 dec.cur = (U8 *)SvPVX (string); 1300 dec.cur = (U8 *)data;
760 dec.end = (U8 *)SvEND (string); 1301 dec.end = (U8 *)data + len;
761 dec.err = 0;
762 dec.depth = 0;
763 1302
764 sv = decode_sv (&dec); 1303 sv = decode_sv (&dec);
765 1304
766 if (offset_return) 1305 if (offset_return)
767 *offset_return = dec.cur; 1306 *offset_return = dec.cur;
770 if (dec.cur != dec.end && !dec.err) 1309 if (dec.cur != dec.end && !dec.err)
771 dec.err = "garbage after CBOR object"; 1310 dec.err = "garbage after CBOR object";
772 1311
773 if (dec.err) 1312 if (dec.err)
774 { 1313 {
1314 if (dec.shareable)
1315 {
1316 // need to break cyclic links, which would all be in shareable
1317 int i;
1318 SV **svp;
1319
1320 for (i = av_len (dec.shareable) + 1; i--; )
1321 if ((svp = av_fetch (dec.shareable, i, 0)))
1322 sv_setsv (*svp, &PL_sv_undef);
1323 }
1324
775 SvREFCNT_dec (sv); 1325 SvREFCNT_dec_NN (sv);
1326
1327 if (dec.err_sv)
1328 sv_2mortal (dec.err_sv);
1329
776 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)SvPVX (string), (int)(uint8_t)*dec.cur); 1330 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
777 } 1331 }
778 1332
779 sv = sv_2mortal (sv); 1333 sv = sv_2mortal (sv);
780 1334
781 return sv; 1335 return sv;
782} 1336}
783 1337
1338/////////////////////////////////////////////////////////////////////////////
1339// incremental parser
1340
1341#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
1342
1343// returns 0 for notyet, 1 for success or error
1344static int
1345incr_parse (CBOR *self, SV *cborstr)
1346{
1347 STRLEN cur;
1348 SvPV (cborstr, cur);
1349
1350 while (ecb_expect_true (self->incr_need <= cur))
1351 {
1352 // table of integer count bytes
1353 static I8 incr_len[MINOR_MASK + 1] = {
1354 0, 0, 0, 0, 0, 0, 0, 0,
1355 0, 0, 0, 0, 0, 0, 0, 0,
1356 0, 0, 0, 0, 0, 0, 0, 0,
1357 1, 2, 4, 8,-1,-1,-1,-2
1358 };
1359
1360 const U8 *p = SvPVX (cborstr) + self->incr_pos;
1361 U8 m = *p & MINOR_MASK;
1362 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1363 I8 ilen = incr_len[m];
1364
1365 self->incr_need = self->incr_pos + 1;
1366
1367 if (ecb_expect_false (ilen < 0))
1368 {
1369 if (m != MINOR_INDEF)
1370 return 1; // error
1371
1372 if (*p == (MAJOR_MISC | MINOR_INDEF))
1373 {
1374 if (count >= 0)
1375 return 1; // error
1376
1377 count = 1;
1378 }
1379 else
1380 {
1381 av_push (self->incr_count, newSViv (-1)); //TODO: nest
1382 count = -1;
1383 }
1384 }
1385 else
1386 {
1387 self->incr_need += ilen;
1388 if (ecb_expect_false (self->incr_need > cur))
1389 return 0;
1390
1391 int major = *p >> MAJOR_SHIFT;
1392
1393 switch (major)
1394 {
1395 case MAJOR_TAG >> MAJOR_SHIFT:
1396 ++count; // tags merely prefix another value
1397 break;
1398
1399 case MAJOR_BYTES >> MAJOR_SHIFT:
1400 case MAJOR_TEXT >> MAJOR_SHIFT:
1401 case MAJOR_ARRAY >> MAJOR_SHIFT:
1402 case MAJOR_MAP >> MAJOR_SHIFT:
1403 {
1404 UV len;
1405
1406 if (ecb_expect_false (ilen))
1407 {
1408 len = 0;
1409
1410 do {
1411 len = (len << 8) | *++p;
1412 } while (--ilen);
1413 }
1414 else
1415 len = m;
1416
1417 switch (major)
1418 {
1419 case MAJOR_BYTES >> MAJOR_SHIFT:
1420 case MAJOR_TEXT >> MAJOR_SHIFT:
1421 self->incr_need += len;
1422 if (ecb_expect_false (self->incr_need > cur))
1423 return 0;
1424
1425 break;
1426
1427 case MAJOR_MAP >> MAJOR_SHIFT:
1428 len <<= 1;
1429 case MAJOR_ARRAY >> MAJOR_SHIFT:
1430 if (len)
1431 {
1432 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1433 count = len + 1;
1434 }
1435 break;
1436 }
1437 }
1438 }
1439 }
1440
1441 self->incr_pos = self->incr_need;
1442
1443 if (count > 0)
1444 {
1445 while (!--count)
1446 {
1447 if (!AvFILLp (self->incr_count))
1448 return 1; // done
1449
1450 SvREFCNT_dec_NN (av_pop (self->incr_count));
1451 count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1452 }
1453
1454 SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
1455 }
1456 }
1457
1458 return 0;
1459}
1460
1461
784///////////////////////////////////////////////////////////////////////////// 1462/////////////////////////////////////////////////////////////////////////////
785// XS interface functions 1463// XS interface functions
786 1464
787MODULE = CBOR::XS PACKAGE = CBOR::XS 1465MODULE = CBOR::XS PACKAGE = CBOR::XS
788 1466
789BOOT: 1467BOOT:
790{ 1468{
791 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 1469 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); 1470 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
794 1471
795 cbor_true = get_bool ("CBOR::XS::true"); 1472 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
796 cbor_false = get_bool ("CBOR::XS::false"); 1473 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
1474
1475 types_true = get_bool ("Types::Serialiser::true" );
1476 types_false = get_bool ("Types::Serialiser::false");
1477 types_error = get_bool ("Types::Serialiser::error");
1478
1479 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1480
1481 sv_cbor = newSVpv ("CBOR", 0);
1482 SvREADONLY_on (sv_cbor);
1483
1484 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
797} 1485}
798 1486
799PROTOTYPES: DISABLE 1487PROTOTYPES: DISABLE
800 1488
801void CLONE (...) 1489void CLONE (...)
802 CODE: 1490 CODE:
803 cbor_stash = 0; 1491 cbor_stash = 0;
804 cbor_boolean_stash = 0;
805 cbor_tagged_stash = 0; 1492 cbor_tagged_stash = 0;
1493 types_error_stash = 0;
1494 types_boolean_stash = 0;
806 1495
807void new (char *klass) 1496void new (char *klass)
808 PPCODE: 1497 PPCODE:
809{ 1498{
810 SV *pv = NEWSV (0, sizeof (CBOR)); 1499 SV *pv = NEWSV (0, sizeof (CBOR));
818 1507
819void shrink (CBOR *self, int enable = 1) 1508void shrink (CBOR *self, int enable = 1)
820 ALIAS: 1509 ALIAS:
821 shrink = F_SHRINK 1510 shrink = F_SHRINK
822 allow_unknown = F_ALLOW_UNKNOWN 1511 allow_unknown = F_ALLOW_UNKNOWN
1512 allow_sharing = F_ALLOW_SHARING
1513 allow_cycles = F_ALLOW_CYCLES
1514 forbid_objects = F_FORBID_OBJECTS
1515 pack_strings = F_PACK_STRINGS
1516 text_keys = F_TEXT_KEYS
1517 text_strings = F_TEXT_STRINGS
1518 validate_utf8 = F_VALIDATE_UTF8
823 PPCODE: 1519 PPCODE:
824{ 1520{
825 if (enable) 1521 if (enable)
826 self->flags |= ix; 1522 self->flags |= ix;
827 else 1523 else
832 1528
833void get_shrink (CBOR *self) 1529void get_shrink (CBOR *self)
834 ALIAS: 1530 ALIAS:
835 get_shrink = F_SHRINK 1531 get_shrink = F_SHRINK
836 get_allow_unknown = F_ALLOW_UNKNOWN 1532 get_allow_unknown = F_ALLOW_UNKNOWN
1533 get_allow_sharing = F_ALLOW_SHARING
1534 get_allow_cycles = F_ALLOW_CYCLES
1535 get_forbid_objects = F_FORBID_OBJECTS
1536 get_pack_strings = F_PACK_STRINGS
1537 get_text_keys = F_TEXT_KEYS
1538 get_text_strings = F_TEXT_STRINGS
1539 get_validate_utf8 = F_VALIDATE_UTF8
837 PPCODE: 1540 PPCODE:
838 XPUSHs (boolSV (self->flags & ix)); 1541 XPUSHs (boolSV (self->flags & ix));
839 1542
840void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1543void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
841 PPCODE: 1544 PPCODE:
857 CODE: 1560 CODE:
858 RETVAL = self->max_size; 1561 RETVAL = self->max_size;
859 OUTPUT: 1562 OUTPUT:
860 RETVAL 1563 RETVAL
861 1564
862#if 0 //TODO 1565void filter (CBOR *self, SV *filter = 0)
863
864void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
865 PPCODE: 1566 PPCODE:
866{
867 SvREFCNT_dec (self->cb_object); 1567 SvREFCNT_dec (self->filter);
868 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0; 1568 self->filter = filter ? newSVsv (filter) : filter;
869
870 XPUSHs (ST (0)); 1569 XPUSHs (ST (0));
871}
872 1570
873void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef) 1571SV *get_filter (CBOR *self)
874 PPCODE: 1572 CODE:
875{ 1573 RETVAL = self->filter ? self->filter : NEWSV (0, 0);
876 if (!self->cb_sk_object) 1574 OUTPUT:
877 self->cb_sk_object = newHV (); 1575 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 1576
897void encode (CBOR *self, SV *scalar) 1577void encode (CBOR *self, SV *scalar)
898 PPCODE: 1578 PPCODE:
899 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1579 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
900 XPUSHs (scalar); 1580 XPUSHs (scalar);
913 EXTEND (SP, 2); 1593 EXTEND (SP, 2);
914 PUSHs (sv); 1594 PUSHs (sv);
915 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1595 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
916} 1596}
917 1597
918#if 0 1598void incr_parse (CBOR *self, SV *cborstr)
1599 ALIAS:
1600 incr_parse_multiple = 1
1601 PPCODE:
1602{
1603 if (SvUTF8 (cborstr))
1604 sv_utf8_downgrade (cborstr, 0);
1605
1606 if (!self->incr_count)
1607 {
1608 self->incr_count = newAV ();
1609 self->incr_pos = 0;
1610 self->incr_need = 1;
1611
1612 av_push (self->incr_count, newSViv (1));
1613 }
1614
1615 do
1616 {
1617 if (!incr_parse (self, cborstr))
1618 {
1619 if (self->incr_need > self->max_size && self->max_size)
1620 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1621 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1622
1623 break;
1624 }
1625
1626 SV *sv;
1627 char *offset;
1628
1629 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1630 XPUSHs (sv);
1631
1632 sv_chop (cborstr, offset);
1633
1634 av_clear (self->incr_count);
1635 av_push (self->incr_count, newSViv (1));
1636
1637 self->incr_pos = 0;
1638 self->incr_need = self->incr_pos + 1;
1639 }
1640 while (ix);
1641}
1642
1643void incr_reset (CBOR *self)
1644 CODE:
1645{
1646 SvREFCNT_dec (self->incr_count);
1647 self->incr_count = 0;
1648}
919 1649
920void DESTROY (CBOR *self) 1650void DESTROY (CBOR *self)
921 CODE: 1651 PPCODE:
922 SvREFCNT_dec (self->cb_sk_object); 1652 cbor_free (self);
923 SvREFCNT_dec (self->cb_object);
924
925#endif
926 1653
927PROTOTYPES: ENABLE 1654PROTOTYPES: ENABLE
928 1655
929void encode_cbor (SV *scalar) 1656void encode_cbor (SV *scalar)
1657 ALIAS:
1658 encode_cbor = 0
1659 encode_cbor_sharing = F_ALLOW_SHARING
930 PPCODE: 1660 PPCODE:
931{ 1661{
932 CBOR cbor; 1662 CBOR cbor;
933 cbor_init (&cbor); 1663 cbor_init (&cbor);
1664 cbor.flags |= ix;
934 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1665 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
935 XPUSHs (scalar); 1666 XPUSHs (scalar);
936} 1667}
937 1668
938void decode_cbor (SV *cborstr) 1669void decode_cbor (SV *cborstr)
942 cbor_init (&cbor); 1673 cbor_init (&cbor);
943 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1674 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
944 XPUSHs (cborstr); 1675 XPUSHs (cborstr);
945} 1676}
946 1677
1678#ifdef __AFL_COMPILER
1679
1680void
1681afl_init ()
1682 CODE:
1683 __AFL_INIT ();
1684
1685int
1686afl_loop (unsigned int count = 10000)
1687 CODE:
1688 RETVAL = __AFL_LOOP (count);
1689 OUTPUT:
1690 RETVAL
1691
1692#endif
1693

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines