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.9 by root, Sun Oct 27 10:17:12 2013 UTC vs.
Revision 1.60 by root, Sat Nov 26 00:47:02 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines