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.8 by root, Sun Oct 27 10:12:01 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
14// known tags, rfc7049 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
15enum cbor_tag 71enum cbor_tag
16{ 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
17 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8 83 CBOR_TAG_DATETIME = 0, // rfc4287, utf-8
18 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any 84 CBOR_TAG_TIMESTAMP = 1, // unix timestamp, any
19 CBOR_TAG_POS_BIGNUM = 2, // byte string 85 CBOR_TAG_POS_BIGNUM = 2, // byte string
20 CBOR_TAG_NEG_BIGNUM = 3, // byte string 86 CBOR_TAG_NEG_BIGNUM = 3, // byte string
21 CBOR_TAG_DECIMAL = 4, // decimal fraction, array 87 CBOR_TAG_DECIMAL = 4, // decimal fraction, array
22 CBOR_TAG_BIGFLOAT = 5, // array 88 CBOR_TAG_BIGFLOAT = 5, // array
23 89
24 CBOR_TAG_CONV_B64U = 21, // base64url, any 90 CBOR_TAG_CONV_B64U = 21, // base64url, any
25 CBOR_TAG_CONV_B64 = 22, // base64, any 91 CBOR_TAG_CONV_B64 = 22, // base64, any
26 CBOR_TAG_CONV_HEX = 23, // base16, any 92 CBOR_TAG_CONV_HEX = 23, // base16, any
27 CBOR_TAG_CBOR = 24, // embedded cbor, byte string 93 CBOR_TAG_CBOR = 24, // embedded cbor, byte string
28 94
29 CBOR_TAG_URI = 32, // URI rfc3986, utf-8 95 CBOR_TAG_URI = 32, // URI rfc3986, utf-8
30 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8 96 CBOR_TAG_B64U = 33, // base64url rfc4648, utf-8
31 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8 97 CBOR_TAG_B64 = 34, // base6 rfc46484, utf-8
32 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8 98 CBOR_TAG_REGEX = 35, // regex pcre/ecma262, utf-8
33 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 99 CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8
34 100
35 CBOR_TAG_MAGIC = 55799 101 CBOR_TAG_MAGIC = 55799, // self-describe cbor
36}; 102};
37 103
38#define F_SHRINK 0x00000200UL 104#define F_SHRINK 0x00000001UL
39#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
40 113
41#define INIT_SIZE 32 // initial scalar size to be allocated 114#define INIT_SIZE 32 // initial scalar size to be allocated
42 115
43#define SB do { 116#define SB do {
44#define SE } while (0) 117#define SE } while (0)
55#else 128#else
56# define CBOR_SLOW 0 129# define CBOR_SLOW 0
57# define CBOR_STASH cbor_stash 130# define CBOR_STASH cbor_stash
58#endif 131#endif
59 132
60static 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::
61static SV *cbor_true, *cbor_false; 134static SV *types_true, *types_false, *types_error, *sv_cbor, *default_filter;
62 135
63typedef struct { 136typedef struct {
64 U32 flags; 137 U32 flags;
65 U32 max_depth; 138 U32 max_depth;
66 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.
67} CBOR; 146} CBOR;
68 147
69ecb_inline void 148ecb_inline void
70cbor_init (CBOR *cbor) 149cbor_init (CBOR *cbor)
71{ 150{
72 Zero (cbor, 1, CBOR); 151 Zero (cbor, 1, CBOR);
73 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);
74} 160}
75 161
76///////////////////////////////////////////////////////////////////////////// 162/////////////////////////////////////////////////////////////////////////////
77// utility functions 163// utility functions
78 164
100 SvPV_renew (sv, SvCUR (sv) + 1); 186 SvPV_renew (sv, SvCUR (sv) + 1);
101#endif 187#endif
102 } 188 }
103} 189}
104 190
105///////////////////////////////////////////////////////////////////////////// 191// minimum length of a string to be registered for stringref
106// fp hell 192ecb_inline int
107 193minimum_string_length (UV idx)
108//TODO 194{
195 return idx <= 23 ? 3
196 : idx <= 0xffU ? 4
197 : idx <= 0xffffU ? 5
198 : idx <= 0xffffffffU ? 7
199 : 11;
200}
109 201
110///////////////////////////////////////////////////////////////////////////// 202/////////////////////////////////////////////////////////////////////////////
111// encoder 203// encoder
112 204
113// structure used for encoding CBOR 205// structure used for encoding CBOR
116 char *cur; // SvPVX (sv) + current output position 208 char *cur; // SvPVX (sv) + current output position
117 char *end; // SvEND (sv) 209 char *end; // SvEND (sv)
118 SV *sv; // result scalar 210 SV *sv; // result scalar
119 CBOR cbor; 211 CBOR cbor;
120 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;
121} enc_t; 217} enc_t;
122 218
123ecb_inline void 219ecb_inline void
124need (enc_t *enc, STRLEN len) 220need (enc_t *enc, STRLEN len)
125{ 221{
126 if (ecb_expect_false (enc->cur + len >= enc->end)) 222 if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len))
127 { 223 {
128 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); 224 STRLEN cur = enc->cur - (char *)SvPVX (enc->sv);
129 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); 225 SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1);
130 enc->cur = SvPVX (enc->sv) + cur; 226 enc->cur = SvPVX (enc->sv) + cur;
131 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; 227 enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1;
142static void 238static void
143encode_uint (enc_t *enc, int major, UV len) 239encode_uint (enc_t *enc, int major, UV len)
144{ 240{
145 need (enc, 9); 241 need (enc, 9);
146 242
147 if (len < 24) 243 if (ecb_expect_true (len < LENGTH_EXT1))
148 *enc->cur++ = major | len; 244 *enc->cur++ = major | len;
149 else if (len <= 0xff) 245 else if (ecb_expect_true (len <= 0xffU))
150 { 246 {
151 *enc->cur++ = major | 24; 247 *enc->cur++ = major | LENGTH_EXT1;
152 *enc->cur++ = len; 248 *enc->cur++ = len;
153 } 249 }
154 else if (len <= 0xffff) 250 else if (len <= 0xffffU)
155 { 251 {
156 *enc->cur++ = major | 25; 252 *enc->cur++ = major | LENGTH_EXT2;
157 *enc->cur++ = len >> 8; 253 *enc->cur++ = len >> 8;
158 *enc->cur++ = len; 254 *enc->cur++ = len;
159 } 255 }
160 else if (len <= 0xffffffff) 256 else if (len <= 0xffffffffU)
161 { 257 {
162 *enc->cur++ = major | 26; 258 *enc->cur++ = major | LENGTH_EXT4;
163 *enc->cur++ = len >> 24; 259 *enc->cur++ = len >> 24;
164 *enc->cur++ = len >> 16; 260 *enc->cur++ = len >> 16;
165 *enc->cur++ = len >> 8; 261 *enc->cur++ = len >> 8;
166 *enc->cur++ = len; 262 *enc->cur++ = len;
167 } 263 }
168 else 264 else
169 { 265 {
170 *enc->cur++ = major | 27; 266 *enc->cur++ = major | LENGTH_EXT8;
171 *enc->cur++ = len >> 56; 267 *enc->cur++ = len >> 56;
172 *enc->cur++ = len >> 48; 268 *enc->cur++ = len >> 48;
173 *enc->cur++ = len >> 40; 269 *enc->cur++ = len >> 40;
174 *enc->cur++ = len >> 32; 270 *enc->cur++ = len >> 32;
175 *enc->cur++ = len >> 24; 271 *enc->cur++ = len >> 24;
177 *enc->cur++ = len >> 8; 273 *enc->cur++ = len >> 8;
178 *enc->cur++ = len; 274 *enc->cur++ = len;
179 } 275 }
180} 276}
181 277
182static 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
183encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 286encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
184{ 287{
185 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);
186 need (enc, len); 318 need (enc, len);
187 memcpy (enc->cur, str, len); 319 memcpy (enc->cur, str, len);
188 enc->cur += len; 320 enc->cur += len;
189} 321}
190 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
191static void encode_sv (enc_t *enc, SV *sv); 348static void encode_sv (enc_t *enc, SV *sv);
192 349
193static void 350static void
194encode_av (enc_t *enc, AV *av) 351encode_av (enc_t *enc, AV *av)
195{ 352{
198 if (enc->depth >= enc->cbor.max_depth) 355 if (enc->depth >= enc->cbor.max_depth)
199 croak (ERR_NESTING_EXCEEDED); 356 croak (ERR_NESTING_EXCEEDED);
200 357
201 ++enc->depth; 358 ++enc->depth;
202 359
203 encode_uint (enc, 0x80, len + 1); 360 encode_uint (enc, MAJOR_ARRAY, len + 1);
204 361
362 if (ecb_expect_false (SvMAGICAL (av)))
205 for (i = 0; i <= len; ++i) 363 for (i = 0; i <= len; ++i)
206 { 364 {
207 SV **svp = av_fetch (av, i, 0); 365 SV **svp = av_fetch (av, i, 0);
208 encode_sv (enc, svp ? *svp : &PL_sv_undef); 366 encode_sv (enc, svp ? *svp : &PL_sv_undef);
209 } 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 }
210 374
211 --enc->depth; 375 --enc->depth;
212} 376}
213 377
214static void 378static void
222 ++enc->depth; 386 ++enc->depth;
223 387
224 int pairs = hv_iterinit (hv); 388 int pairs = hv_iterinit (hv);
225 int mg = SvMAGICAL (hv); 389 int mg = SvMAGICAL (hv);
226 390
227 if (mg) 391 if (ecb_expect_false (mg))
228 encode_ch (enc, 0xa0 | 31); 392 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
229 else 393 else
230 encode_uint (enc, 0xa0, pairs); 394 encode_uint (enc, MAJOR_MAP, pairs);
231 395
232 while ((he = hv_iternext (hv))) 396 while ((he = hv_iternext (hv)))
233 { 397 {
234 if (HeKLEN (he) == HEf_SVKEY) 398 if (HeKLEN (he) == HEf_SVKEY)
235 encode_sv (enc, HeSVKEY (he)); 399 encode_sv (enc, HeSVKEY (he));
236 else 400 else
237 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));
238 402
239 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));
240 } 404 }
241 405
242 if (mg) 406 if (ecb_expect_false (mg))
243 encode_ch (enc, 0xe0 | 31); 407 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
244 408
245 --enc->depth; 409 --enc->depth;
246} 410}
247 411
248// encode objects, arrays and special \0=false and \1=true values. 412// encode objects, arrays and special \0=false and \1=true values.
249static void 413static void
250encode_rv (enc_t *enc, SV *sv) 414encode_rv (enc_t *enc, SV *sv)
251{ 415{
252 svtype svt;
253
254 SvGETMAGIC (sv); 416 SvGETMAGIC (sv);
417
255 svt = SvTYPE (sv); 418 svtype svt = SvTYPE (sv);
256 419
257 if (ecb_expect_false (SvOBJECT (sv))) 420 if (ecb_expect_false (SvOBJECT (sv)))
258 { 421 {
259 HV *boolean_stash = !CBOR_SLOW || cbor_boolean_stash 422 HV *boolean_stash = !CBOR_SLOW || types_boolean_stash
260 ? cbor_boolean_stash 423 ? types_boolean_stash
261 : 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);
262 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 428 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
263 ? cbor_tagged_stash 429 ? cbor_tagged_stash
264 : gv_stashpv ("CBOR::XS::Tagged" , 1); 430 : gv_stashpv ("CBOR::XS::Tagged" , 1);
265 431
432 HV *stash = SvSTASH (sv);
433
266 if (SvSTASH (sv) == boolean_stash) 434 if (stash == boolean_stash)
267 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 }
268 else if (SvSTASH (sv) == tagged_stash) 444 else if (stash == tagged_stash)
269 { 445 {
270 if (svt != SVt_PVAV) 446 if (svt != SVt_PVAV)
271 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 447 croak ("encountered CBOR::XS::Tagged object that isn't an array");
272 448
273 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 449 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
274 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;
275 } 469 }
276 else 470 else
277 { 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);
278 // 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
279 GV *to_cbor = gv_fetchmethod_autoload (SvSTASH (sv), "TO_CBOR", 0);
280
281 if (to_cbor)
282 {
283 dSP;
284
285 ENTER; SAVETMPS; PUSHMARK (SP);
286 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), SvSTASH (sv))); 493 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
287 494
288 // calling with G_SCALAR ensures that we always get a 1 return value
289 PUTBACK; 495 PUTBACK;
496 // G_SCALAR ensures that return value is 1
290 call_sv ((SV *)GvCV (to_cbor), G_SCALAR); 497 call_sv ((SV *)GvCV (method), G_SCALAR);
291 SPAGAIN; 498 SPAGAIN;
292 499
293 // catch this surprisingly common error 500 // catch this surprisingly common error
294 if (SvROK (TOPs) && SvRV (TOPs) == sv) 501 if (SvROK (TOPs) && SvRV (TOPs) == sv)
295 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));
296 503
297 sv = POPs; 504 encode_sv (enc, POPs);
505
298 PUTBACK; 506 PUTBACK;
299 507
300 encode_sv (enc, sv);
301
302 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;
303 } 540 }
541
542 PUTBACK;
543
544 FREETMPS; LEAVE;
545 }
304 else 546 else
305 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",
306 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 548 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
307 }
308 } 549 }
309 else if (svt == SVt_PVHV) 550 else if (svt == SVt_PVHV)
310 encode_hv (enc, (HV *)sv); 551 encode_hv (enc, (HV *)sv);
311 else if (svt == SVt_PVAV) 552 else if (svt == SVt_PVAV)
312 encode_av (enc, (AV *)sv); 553 encode_av (enc, (AV *)sv);
313 else if (svt < SVt_PVAV)
314 {
315 STRLEN len = 0;
316 char *pv = svt ? SvPV (sv, len) : 0;
317
318 if (len == 1 && *pv == '1')
319 encode_ch (enc, 0xe0 | 21);
320 else if (len == 1 && *pv == '0')
321 encode_ch (enc, 0xe0 | 20);
322 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
323 encode_ch (enc, 0xe0 | 23);
324 else
325 croak ("cannot encode reference to scalar '%s' unless the scalar is 0 or 1",
326 SvPV_nolen (sv_2mortal (newRV_inc (sv))));
327 }
328 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
329 encode_ch (enc, 0xe0 | 23);
330 else 554 else
331 croak ("encountered %s, but CBOR can only represent references to arrays or hashes", 555 {
332 SvPV_nolen (sv_2mortal (newRV_inc (sv)))); 556 encode_tag (enc, CBOR_TAG_INDIRECTION);
557 encode_sv (enc, sv);
558 }
333} 559}
334 560
335static void 561static void
336encode_nv (enc_t *enc, SV *sv) 562encode_nv (enc_t *enc, SV *sv)
337{ 563{
338 double nv = SvNVX (sv); 564 double nv = SvNVX (sv);
339 565
340 need (enc, 9); 566 need (enc, 9);
341 567
342 if (ecb_expect_false (nv == (U32)nv)) 568 if (ecb_expect_false (nv == (NV)(U32)nv))
343 encode_uint (enc, 0x00, (U32)nv); 569 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
344 //TODO: maybe I32? 570 //TODO: maybe I32?
345 else if (ecb_expect_false (nv == (float)nv)) 571 else if (ecb_expect_false (nv == (float)nv))
346 { 572 {
573 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
574
347 uint32_t fp = ecb_float_to_binary32 (nv); 575 uint32_t fp = ecb_float_to_binary32 (nv);
348
349 *enc->cur++ = 0xe0 | 26;
350 576
351 if (!ecb_big_endian ()) 577 if (!ecb_big_endian ())
352 fp = ecb_bswap32 (fp); 578 fp = ecb_bswap32 (fp);
353 579
354 memcpy (enc->cur, &fp, 4); 580 memcpy (enc->cur, &fp, 4);
355 enc->cur += 4; 581 enc->cur += 4;
356 } 582 }
357 else 583 else
358 { 584 {
585 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
586
359 uint64_t fp = ecb_double_to_binary64 (nv); 587 uint64_t fp = ecb_double_to_binary64 (nv);
360
361 *enc->cur++ = 0xe0 | 27;
362 588
363 if (!ecb_big_endian ()) 589 if (!ecb_big_endian ())
364 fp = ecb_bswap64 (fp); 590 fp = ecb_bswap64 (fp);
365 591
366 memcpy (enc->cur, &fp, 8); 592 memcpy (enc->cur, &fp, 8);
375 601
376 if (SvPOKp (sv)) 602 if (SvPOKp (sv))
377 { 603 {
378 STRLEN len; 604 STRLEN len;
379 char *str = SvPV (sv, len); 605 char *str = SvPV (sv, len);
380 encode_str (enc, SvUTF8 (sv), str, len); 606 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
381 } 607 }
382 else if (SvNOKp (sv)) 608 else if (SvNOKp (sv))
383 encode_nv (enc, sv); 609 encode_nv (enc, sv);
384 else if (SvIOKp (sv)) 610 else if (SvIOKp (sv))
385 { 611 {
386 if (SvIsUV (sv)) 612 if (SvIsUV (sv))
387 encode_uint (enc, 0x00, SvUVX (sv)); 613 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
388 else if (SvIVX (sv) >= 0) 614 else if (SvIVX (sv) >= 0)
389 encode_uint (enc, 0x00, SvIVX (sv)); 615 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
390 else 616 else
391 encode_uint (enc, 0x20, -(SvIVX (sv) + 1)); 617 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
392 } 618 }
393 else if (SvROK (sv)) 619 else if (SvROK (sv))
394 encode_rv (enc, SvRV (sv)); 620 encode_rv (enc, SvRV (sv));
395 else if (!SvOK (sv)) 621 else if (!SvOK (sv))
396 encode_ch (enc, 0xe0 | 22); 622 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
397 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 623 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
398 encode_ch (enc, 0xe0 | 23); 624 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
399 else 625 else
400 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",
401 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 627 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
402} 628}
403 629
404static SV * 630static SV *
405encode_cbor (SV *scalar, CBOR *cbor) 631encode_cbor (SV *scalar, CBOR *cbor)
406{ 632{
407 enc_t enc; 633 enc_t enc = { 0 };
408 634
409 enc.cbor = *cbor; 635 enc.cbor = *cbor;
410 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 636 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
411 enc.cur = SvPVX (enc.sv); 637 enc.cur = SvPVX (enc.sv);
412 enc.end = SvEND (enc.sv); 638 enc.end = SvEND (enc.sv);
413 enc.depth = 0;
414 639
415 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
416 encode_sv (&enc, scalar); 649 encode_sv (&enc, scalar);
417 650
418 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv)); 651 SvCUR_set (enc.sv, enc.cur - SvPVX (enc.sv));
419 *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
420 653
434 U8 *end; // end of input string 667 U8 *end; // end of input string
435 const char *err; // parse error, if != 0 668 const char *err; // parse error, if != 0
436 CBOR cbor; 669 CBOR cbor;
437 U32 depth; // recursion depth 670 U32 depth; // recursion depth
438 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
439} dec_t; 676} dec_t;
440 677
441#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);
442 685
443#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;
444 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
445#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)
446#define DEC_DEC_DEPTH --dec->depth 715#define DEC_DEC_DEPTH --dec->depth
447 716
448static UV 717static UV
449decode_uint (dec_t *dec) 718decode_uint (dec_t *dec)
450{ 719{
451 switch (*dec->cur & 31) 720 U8 m = *dec->cur & MINOR_MASK;
452 { 721 ++dec->cur;
453 case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
454 case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15:
455 case 16: case 17: case 18: case 19: case 20: case 21: case 22: case 23:
456 return *dec->cur++ & 31;
457 722
458 case 24: 723 if (ecb_expect_true (m < LENGTH_EXT1))
724 return m;
725 else if (ecb_expect_true (m == LENGTH_EXT1))
726 {
459 WANT (2); 727 WANT (1);
460 dec->cur += 2; 728 dec->cur += 1;
461 return dec->cur[-1]; 729 return dec->cur[-1];
462 730 }
463 case 25: 731 else if (ecb_expect_true (m == LENGTH_EXT2))
732 {
464 WANT (3); 733 WANT (2);
465 dec->cur += 3; 734 dec->cur += 2;
466 return (((UV)dec->cur[-2]) << 8) 735 return (((UV)dec->cur[-2]) << 8)
467 | ((UV)dec->cur[-1]); 736 | ((UV)dec->cur[-1]);
468 737 }
469 case 26: 738 else if (ecb_expect_true (m == LENGTH_EXT4))
739 {
470 WANT (5); 740 WANT (4);
471 dec->cur += 5; 741 dec->cur += 4;
472 return (((UV)dec->cur[-4]) << 24) 742 return (((UV)dec->cur[-4]) << 24)
473 | (((UV)dec->cur[-3]) << 16) 743 | (((UV)dec->cur[-3]) << 16)
474 | (((UV)dec->cur[-2]) << 8) 744 | (((UV)dec->cur[-2]) << 8)
475 | ((UV)dec->cur[-1]); 745 | ((UV)dec->cur[-1]);
476 746 }
477 case 27: 747 else if (ecb_expect_true (m == LENGTH_EXT8))
748 {
478 WANT (9); 749 WANT (8);
479 dec->cur += 9; 750 dec->cur += 8;
751
752 return
753#if UVSIZE < 8
754 0
755#else
480 return (((UV)dec->cur[-8]) << 56) 756 (((UV)dec->cur[-8]) << 56)
481 | (((UV)dec->cur[-7]) << 48) 757 | (((UV)dec->cur[-7]) << 48)
482 | (((UV)dec->cur[-6]) << 40) 758 | (((UV)dec->cur[-6]) << 40)
483 | (((UV)dec->cur[-5]) << 32) 759 | (((UV)dec->cur[-5]) << 32)
760#endif
484 | (((UV)dec->cur[-4]) << 24) 761 | (((UV)dec->cur[-4]) << 24)
485 | (((UV)dec->cur[-3]) << 16) 762 | (((UV)dec->cur[-3]) << 16)
486 | (((UV)dec->cur[-2]) << 8) 763 | (((UV)dec->cur[-2]) << 8)
487 | ((UV)dec->cur[-1]); 764 | ((UV)dec->cur[-1]);
488 765 }
489 default: 766 else
490 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 767 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
491 }
492 768
493fail: 769fail:
494 return 0; 770 return 0;
495} 771}
496 772
501{ 777{
502 AV *av = newAV (); 778 AV *av = newAV ();
503 779
504 DEC_INC_DEPTH; 780 DEC_INC_DEPTH;
505 781
506 if ((*dec->cur & 31) == 31) 782 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
507 { 783 {
508 ++dec->cur; 784 ++dec->cur;
509 785
510 for (;;) 786 for (;;)
511 { 787 {
512 WANT (1); 788 WANT (1);
513 789
514 if (*dec->cur == (0xe0 | 31)) 790 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
515 { 791 {
516 ++dec->cur; 792 ++dec->cur;
517 break; 793 break;
518 } 794 }
519 795
520 av_push (av, decode_sv (dec)); 796 av_push (av, decode_sv (dec));
521 } 797 }
522 } 798 }
523 else 799 else
524 { 800 {
525 int i, len = decode_uint (dec); 801 UV i, len = decode_uint (dec);
526 802
803 WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays
527 av_fill (av, len - 1); 804 av_fill (av, len - 1);
528 805
529 for (i = 0; i < len; ++i) 806 for (i = 0; i < len; ++i)
530 AvARRAY (av)[i] = decode_sv (dec); 807 AvARRAY (av)[i] = decode_sv (dec);
531 } 808 }
532 809
533 DEC_DEC_DEPTH; 810 DEC_DEC_DEPTH;
534 return newRV_noinc ((SV *)av); 811 return newRV_noinc ((SV *)av);
535 812
536fail: 813fail:
537 SvREFCNT_dec (av); 814 SvREFCNT_dec_NN (av);
538 DEC_DEC_DEPTH; 815 DEC_DEC_DEPTH;
539 return &PL_sv_undef; 816 return &PL_sv_undef;
540} 817}
541 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
542static SV * 893static SV *
543decode_hv (dec_t *dec) 894decode_hv (dec_t *dec)
544{ 895{
545 HV *hv = newHV (); 896 HV *hv = newHV ();
546 897
547 DEC_INC_DEPTH; 898 DEC_INC_DEPTH;
548 899
549 if ((*dec->cur & 31) == 31) 900 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
550 { 901 {
551 ++dec->cur; 902 ++dec->cur;
552 903
553 for (;;) 904 for (;;)
554 { 905 {
555 WANT (1); 906 WANT (1);
556 907
557 if (*dec->cur == (0xe0 | 31)) 908 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err)
558 { 909 {
559 ++dec->cur; 910 ++dec->cur;
560 break; 911 break;
561 } 912 }
562 913
563 SV *k = decode_sv (dec); 914 decode_he (dec, hv);
564 SV *v = decode_sv (dec);
565
566 hv_store_ent (hv, k, v, 0);
567 } 915 }
568 } 916 }
569 else 917 else
570 { 918 {
571 int len = decode_uint (dec); 919 UV pairs = decode_uint (dec);
572 920
921 WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes
922
573 while (len--) 923 while (pairs--)
574 { 924 decode_he (dec, hv);
575 SV *k = decode_sv (dec);
576 SV *v = decode_sv (dec);
577
578 hv_store_ent (hv, k, v, 0);
579 }
580 } 925 }
581 926
582 DEC_DEC_DEPTH; 927 DEC_DEC_DEPTH;
583 return newRV_noinc ((SV *)hv); 928 return newRV_noinc ((SV *)hv);
584 929
585fail: 930fail:
586 SvREFCNT_dec (hv); 931 SvREFCNT_dec_NN (hv);
587 DEC_DEC_DEPTH; 932 DEC_DEC_DEPTH;
588 return &PL_sv_undef; 933 return &PL_sv_undef;
589} 934}
590 935
591static SV * 936static SV *
592decode_str (dec_t *dec, int utf8) 937decode_str (dec_t *dec, int utf8)
593{ 938{
594 SV *sv = 0; 939 SV *sv = 0;
595 940
596 if ((*dec->cur & 31) == 31) 941 if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF))
597 { 942 {
943 // indefinite length strings
598 ++dec->cur; 944 ++dec->cur;
599 945
946 U8 major = *dec->cur & MAJOR_MISC;
947
600 sv = newSVpvn ("", 0); 948 sv = newSVpvn ("", 0);
601 949
602 // not very fast, and certainly not robust against illegal input
603 for (;;) 950 for (;;)
604 { 951 {
605 WANT (1); 952 WANT (1);
606 953
607 if (*dec->cur == (0xe0 | 31)) 954 if ((*dec->cur - major) > LENGTH_EXT8)
955 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
608 { 956 {
609 ++dec->cur; 957 ++dec->cur;
610 break; 958 break;
611 } 959 }
960 else
961 ERR ("corrupted CBOR data (invalid chunks in indefinite length string)");
612 962
613 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;
614 } 968 }
615 } 969 }
616 else 970 else
617 { 971 {
618 STRLEN len = decode_uint (dec); 972 STRLEN len = decode_uint (dec);
619 973
620 WANT (len); 974 WANT (len);
621 sv = newSVpvn (dec->cur, len); 975 sv = newSVpvn (dec->cur, len);
622 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));
623 } 981 }
624 982
625 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
626 SvUTF8_on (sv); 989 SvUTF8_on (sv);
990 }
627 991
628 return sv; 992 return sv;
629 993
630fail: 994fail:
631 SvREFCNT_dec (sv); 995 SvREFCNT_dec (sv);
633} 997}
634 998
635static SV * 999static SV *
636decode_tagged (dec_t *dec) 1000decode_tagged (dec_t *dec)
637{ 1001{
1002 SV *sv = 0;
638 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:
639 SV *sv = decode_sv (dec); 1010 sv = decode_sv (dec);
1011 break;
640 1012
641 if (tag == CBOR_TAG_MAGIC) // 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
642 return sv; 1193 return sv;
643 1194
644 AV *av = newAV (); 1195fail:
645 av_push (av, newSVuv (tag)); 1196 SvREFCNT_dec (sv);
646 av_push (av, sv); 1197 return &PL_sv_undef;
647
648 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
649 ? cbor_tagged_stash
650 : gv_stashpv ("CBOR::XS::Tagged" , 1);
651
652 return sv_bless (newRV_noinc ((SV *)av), tagged_stash);
653} 1198}
654 1199
655static SV * 1200static SV *
656decode_sv (dec_t *dec) 1201decode_sv (dec_t *dec)
657{ 1202{
658 WANT (1); 1203 WANT (1);
659 1204
660 switch (*dec->cur >> 5) 1205 switch (*dec->cur >> MAJOR_SHIFT)
661 { 1206 {
662 case 0: // unsigned int 1207 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
663 return newSVuv (decode_uint (dec)); 1208 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
664 case 1: // negative int 1209 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
665 return newSViv (-1 - (IV)decode_uint (dec)); 1210 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
666 case 2: // octet string 1211 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
667 return decode_str (dec, 0); 1212 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
668 case 3: // utf-8 string 1213 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
669 return decode_str (dec, 1); 1214
670 case 4: // array 1215 case MAJOR_MISC >> MAJOR_SHIFT:
671 return decode_av (dec);
672 case 5: // map
673 return decode_hv (dec);
674 case 6: // tag
675 return decode_tagged (dec);
676 case 7: // misc
677 switch (*dec->cur++ & 31) 1216 switch (*dec->cur++ & MINOR_MASK)
678 { 1217 {
679 case 20: 1218 case SIMPLE_FALSE:
680#if CBOR_SLOW 1219#if CBOR_SLOW
681 cbor_false = get_bool ("CBOR::XS::false"); 1220 types_false = get_bool ("Types::Serialiser::false");
682#endif 1221#endif
683 return newSVsv (cbor_false); 1222 return newSVsv (types_false);
684 case 21: 1223 case SIMPLE_TRUE:
685#if CBOR_SLOW 1224#if CBOR_SLOW
686 cbor_true = get_bool ("CBOR::XS::true"); 1225 types_true = get_bool ("Types::Serialiser::true");
687#endif 1226#endif
688 return newSVsv (cbor_true); 1227 return newSVsv (types_true);
689 case 22: 1228 case SIMPLE_NULL:
690 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);
691 1235
692 case 25: 1236 case MISC_FLOAT16:
693 { 1237 {
694 WANT (2); 1238 WANT (2);
695 1239
696 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1240 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
697 dec->cur += 2; 1241 dec->cur += 2;
698 1242
699 return newSVnv (ecb_binary16_to_float (fp)); 1243 return newSVnv (ecb_binary16_to_float (fp));
700 } 1244 }
701 1245
702 case 26: 1246 case MISC_FLOAT32:
703 { 1247 {
704 uint32_t fp; 1248 uint32_t fp;
705 WANT (4); 1249 WANT (4);
706 memcpy (&fp, dec->cur, 4); 1250 memcpy (&fp, dec->cur, 4);
707 dec->cur += 4; 1251 dec->cur += 4;
710 fp = ecb_bswap32 (fp); 1254 fp = ecb_bswap32 (fp);
711 1255
712 return newSVnv (ecb_binary32_to_float (fp)); 1256 return newSVnv (ecb_binary32_to_float (fp));
713 } 1257 }
714 1258
715 case 27: 1259 case MISC_FLOAT64:
716 { 1260 {
717 uint64_t fp; 1261 uint64_t fp;
718 WANT (8); 1262 WANT (8);
719 memcpy (&fp, dec->cur, 8); 1263 memcpy (&fp, dec->cur, 8);
720 dec->cur += 8; 1264 dec->cur += 8;
723 fp = ecb_bswap64 (fp); 1267 fp = ecb_bswap64 (fp);
724 1268
725 return newSVnv (ecb_binary64_to_double (fp)); 1269 return newSVnv (ecb_binary64_to_double (fp));
726 } 1270 }
727 1271
728 // 0..19 unassigned 1272 // 0..19 unassigned simple
729 // 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
730 default: 1276 default:
731 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1277 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
732 } 1278 }
733 1279
734 break; 1280 break;
735 } 1281 }
736 1282
739} 1285}
740 1286
741static SV * 1287static SV *
742decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1288decode_cbor (SV *string, CBOR *cbor, char **offset_return)
743{ 1289{
744 dec_t dec; 1290 dec_t dec = { 0 };
745 SV *sv; 1291 SV *sv;
1292 STRLEN len;
1293 char *data = SvPVbyte (string, len);
746 1294
747 /* work around bugs in 5.10 where manipulating magic values
748 * makes perl ignore the magic in subsequent accesses.
749 * also make a copy of non-PV values, to get them into a clean
750 * state (SvPV should do that, but it's buggy, see below).
751 */
752 /*SvGETMAGIC (string);*/
753 if (SvMAGICAL (string) || !SvPOK (string))
754 string = sv_2mortal (newSVsv (string));
755
756 SvUPGRADE (string, SVt_PV);
757
758 /* work around a bug in perl 5.10, which causes SvCUR to fail an
759 * assertion with -DDEBUGGING, although SvCUR is documented to
760 * return the xpv_cur field which certainly exists after upgrading.
761 * according to nicholas clark, calling SvPOK fixes this.
762 * But it doesn't fix it, so try another workaround, call SvPV_nolen
763 * and hope for the best.
764 * Damnit, SvPV_nolen still trips over yet another assertion. This
765 * assertion business is seriously broken, try yet another workaround
766 * for the broken -DDEBUGGING.
767 */
768 {
769#ifdef DEBUGGING
770 STRLEN offset = SvOK (string) ? sv_len (string) : 0;
771#else
772 STRLEN offset = SvCUR (string);
773#endif
774
775 if (offset > cbor->max_size && cbor->max_size) 1295 if (len > cbor->max_size && cbor->max_size)
776 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",
777 (unsigned long)SvCUR (string), (unsigned long)cbor->max_size); 1297 (unsigned long)len, (unsigned long)cbor->max_size);
778 }
779
780 sv_utf8_downgrade (string, 0);
781 1298
782 dec.cbor = *cbor; 1299 dec.cbor = *cbor;
783 dec.cur = (U8 *)SvPVX (string); 1300 dec.cur = (U8 *)data;
784 dec.end = (U8 *)SvEND (string); 1301 dec.end = (U8 *)data + len;
785 dec.err = 0;
786 dec.depth = 0;
787 1302
788 sv = decode_sv (&dec); 1303 sv = decode_sv (&dec);
789 1304
790 if (offset_return) 1305 if (offset_return)
791 *offset_return = dec.cur; 1306 *offset_return = dec.cur;
794 if (dec.cur != dec.end && !dec.err) 1309 if (dec.cur != dec.end && !dec.err)
795 dec.err = "garbage after CBOR object"; 1310 dec.err = "garbage after CBOR object";
796 1311
797 if (dec.err) 1312 if (dec.err)
798 { 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
799 SvREFCNT_dec (sv); 1325 SvREFCNT_dec_NN (sv);
1326
1327 if (dec.err_sv)
1328 sv_2mortal (dec.err_sv);
1329
800 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);
801 } 1331 }
802 1332
803 sv = sv_2mortal (sv); 1333 sv = sv_2mortal (sv);
804 1334
805 return sv; 1335 return sv;
806} 1336}
807 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
808///////////////////////////////////////////////////////////////////////////// 1462/////////////////////////////////////////////////////////////////////////////
809// XS interface functions 1463// XS interface functions
810 1464
811MODULE = CBOR::XS PACKAGE = CBOR::XS 1465MODULE = CBOR::XS PACKAGE = CBOR::XS
812 1466
813BOOT: 1467BOOT:
814{ 1468{
815 cbor_stash = gv_stashpv ("CBOR::XS" , 1); 1469 cbor_stash = gv_stashpv ("CBOR::XS" , 1);
816 cbor_boolean_stash = gv_stashpv ("CBOR::XS::Boolean", 1);
817 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1); 1470 cbor_tagged_stash = gv_stashpv ("CBOR::XS::Tagged" , 1);
818 1471
819 cbor_true = get_bool ("CBOR::XS::true"); 1472 types_boolean_stash = gv_stashpv ("Types::Serialiser::Boolean", 1);
820 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));
821} 1485}
822 1486
823PROTOTYPES: DISABLE 1487PROTOTYPES: DISABLE
824 1488
825void CLONE (...) 1489void CLONE (...)
826 CODE: 1490 CODE:
827 cbor_stash = 0; 1491 cbor_stash = 0;
828 cbor_boolean_stash = 0;
829 cbor_tagged_stash = 0; 1492 cbor_tagged_stash = 0;
1493 types_error_stash = 0;
1494 types_boolean_stash = 0;
830 1495
831void new (char *klass) 1496void new (char *klass)
832 PPCODE: 1497 PPCODE:
833{ 1498{
834 SV *pv = NEWSV (0, sizeof (CBOR)); 1499 SV *pv = NEWSV (0, sizeof (CBOR));
842 1507
843void shrink (CBOR *self, int enable = 1) 1508void shrink (CBOR *self, int enable = 1)
844 ALIAS: 1509 ALIAS:
845 shrink = F_SHRINK 1510 shrink = F_SHRINK
846 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
847 PPCODE: 1519 PPCODE:
848{ 1520{
849 if (enable) 1521 if (enable)
850 self->flags |= ix; 1522 self->flags |= ix;
851 else 1523 else
856 1528
857void get_shrink (CBOR *self) 1529void get_shrink (CBOR *self)
858 ALIAS: 1530 ALIAS:
859 get_shrink = F_SHRINK 1531 get_shrink = F_SHRINK
860 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
861 PPCODE: 1540 PPCODE:
862 XPUSHs (boolSV (self->flags & ix)); 1541 XPUSHs (boolSV (self->flags & ix));
863 1542
864void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1543void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
865 PPCODE: 1544 PPCODE:
881 CODE: 1560 CODE:
882 RETVAL = self->max_size; 1561 RETVAL = self->max_size;
883 OUTPUT: 1562 OUTPUT:
884 RETVAL 1563 RETVAL
885 1564
886#if 0 //TODO 1565void filter (CBOR *self, SV *filter = 0)
887
888void filter_cbor_object (CBOR *self, SV *cb = &PL_sv_undef)
889 PPCODE: 1566 PPCODE:
890{
891 SvREFCNT_dec (self->cb_object); 1567 SvREFCNT_dec (self->filter);
892 self->cb_object = SvOK (cb) ? newSVsv (cb) : 0; 1568 self->filter = filter ? newSVsv (filter) : filter;
893
894 XPUSHs (ST (0)); 1569 XPUSHs (ST (0));
895}
896 1570
897void filter_cbor_single_key_object (CBOR *self, SV *key, SV *cb = &PL_sv_undef) 1571SV *get_filter (CBOR *self)
898 PPCODE: 1572 CODE:
899{ 1573 RETVAL = self->filter ? self->filter : NEWSV (0, 0);
900 if (!self->cb_sk_object) 1574 OUTPUT:
901 self->cb_sk_object = newHV (); 1575 RETVAL
902
903 if (SvOK (cb))
904 hv_store_ent (self->cb_sk_object, key, newSVsv (cb), 0);
905 else
906 {
907 hv_delete_ent (self->cb_sk_object, key, G_DISCARD, 0);
908
909 if (!HvKEYS (self->cb_sk_object))
910 {
911 SvREFCNT_dec (self->cb_sk_object);
912 self->cb_sk_object = 0;
913 }
914 }
915
916 XPUSHs (ST (0));
917}
918
919#endif
920 1576
921void encode (CBOR *self, SV *scalar) 1577void encode (CBOR *self, SV *scalar)
922 PPCODE: 1578 PPCODE:
923 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN; 1579 PUTBACK; scalar = encode_cbor (scalar, self); SPAGAIN;
924 XPUSHs (scalar); 1580 XPUSHs (scalar);
937 EXTEND (SP, 2); 1593 EXTEND (SP, 2);
938 PUSHs (sv); 1594 PUSHs (sv);
939 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1595 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
940} 1596}
941 1597
942#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}
943 1649
944void DESTROY (CBOR *self) 1650void DESTROY (CBOR *self)
945 CODE: 1651 PPCODE:
946 SvREFCNT_dec (self->cb_sk_object); 1652 cbor_free (self);
947 SvREFCNT_dec (self->cb_object);
948
949#endif
950 1653
951PROTOTYPES: ENABLE 1654PROTOTYPES: ENABLE
952 1655
953void encode_cbor (SV *scalar) 1656void encode_cbor (SV *scalar)
1657 ALIAS:
1658 encode_cbor = 0
1659 encode_cbor_sharing = F_ALLOW_SHARING
954 PPCODE: 1660 PPCODE:
955{ 1661{
956 CBOR cbor; 1662 CBOR cbor;
957 cbor_init (&cbor); 1663 cbor_init (&cbor);
1664 cbor.flags |= ix;
958 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1665 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
959 XPUSHs (scalar); 1666 XPUSHs (scalar);
960} 1667}
961 1668
962void decode_cbor (SV *cborstr) 1669void decode_cbor (SV *cborstr)
966 cbor_init (&cbor); 1673 cbor_init (&cbor);
967 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; 1674 PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN;
968 XPUSHs (cborstr); 1675 XPUSHs (cborstr);
969} 1676}
970 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