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