ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/CBOR-XS/XS.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines