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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines