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.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
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
329 if (SvMAGICAL (av))
234 for (i = 0; i <= len; ++i) 330 for (i = 0; i <= len; ++i)
235 { 331 {
236 SV **svp = av_fetch (av, i, 0); 332 SV **svp = av_fetch (av, i, 0);
237 encode_sv (enc, svp ? *svp : &PL_sv_undef); 333 encode_sv (enc, svp ? *svp : &PL_sv_undef);
238 } 334 }
335 else
336 for (i = 0; i <= len; ++i)
337 encode_sv (enc, AvARRAY (av)[i]);
239 338
240 --enc->depth; 339 --enc->depth;
241}
242
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} 340}
251 341
252static void 342static void
253encode_hv (enc_t *enc, HV *hv) 343encode_hv (enc_t *enc, HV *hv)
254{ 344{
… …
261 351
262 int pairs = hv_iterinit (hv); 352 int pairs = hv_iterinit (hv);
263 int mg = SvMAGICAL (hv); 353 int mg = SvMAGICAL (hv);
264 354
265 if (mg) 355 if (mg)
266 encode_ch (enc, 0xa0 | 31); 356 encode_ch (enc, MAJOR_MAP | MINOR_INDEF);
267 else 357 else
268 encode_uint (enc, 0xa0, pairs); 358 encode_uint (enc, MAJOR_MAP, pairs);
269 359
270 while ((he = hv_iternext (hv))) 360 while ((he = hv_iternext (hv)))
271 { 361 {
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) 362 if (HeKLEN (he) == HEf_SVKEY)
277 svp = hv_fetch_ent (enc->stringref[!! SvUTF8 (HeSVKEY (he))], HeSVKEY (he) , 1, 0);//TODO return HE :/ 363 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 364 else
294 encode_he (enc, he); 365 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he));
295 366
296 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));
297 } 368 }
298 369
299 if (mg) 370 if (mg)
300 encode_ch (enc, 0xe0 | 31); 371 encode_ch (enc, MAJOR_MISC | MINOR_INDEF);
301 372
302 --enc->depth; 373 --enc->depth;
303} 374}
304 375
305// encode objects, arrays and special \0=false and \1=true values. 376// encode objects, arrays and special \0=false and \1=true values.
306static void 377static void
307encode_rv (enc_t *enc, SV *sv) 378encode_rv (enc_t *enc, SV *sv)
308{ 379{
309 SvGETMAGIC (sv); 380 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 381
333 svtype svt = SvTYPE (sv); 382 svtype svt = SvTYPE (sv);
334 383
335 if (ecb_expect_false (SvOBJECT (sv))) 384 if (ecb_expect_false (SvOBJECT (sv)))
336 { 385 {
… …
343 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 392 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
344 ? cbor_tagged_stash 393 ? cbor_tagged_stash
345 : gv_stashpv ("CBOR::XS::Tagged" , 1); 394 : gv_stashpv ("CBOR::XS::Tagged" , 1);
346 395
347 HV *stash = SvSTASH (sv); 396 HV *stash = SvSTASH (sv);
348 GV *method;
349 397
350 if (stash == boolean_stash) 398 if (stash == boolean_stash)
351 encode_ch (enc, SvIV (sv) ? 0xe0 | 21 : 0xe0 | 20); 399 {
400 encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE);
401 return;
402 }
352 else if (stash == error_stash) 403 else if (stash == error_stash)
353 encode_ch (enc, 0xe0 | 23); 404 {
405 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
406 return;
407 }
354 else if (stash == tagged_stash) 408 else if (stash == tagged_stash)
355 { 409 {
356 if (svt != SVt_PVAV) 410 if (svt != SVt_PVAV)
357 croak ("encountered CBOR::XS::Tagged object that isn't an array"); 411 croak ("encountered CBOR::XS::Tagged object that isn't an array");
358 412
359 encode_uint (enc, 0xc0, SvUV (*av_fetch ((AV *)sv, 0, 1))); 413 encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1)));
360 encode_sv (enc, *av_fetch ((AV *)sv, 1, 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))
361 } 429 {
430 encode_tag (enc, CBOR_TAG_VALUE_SHAREDREF);
431 encode_uint (enc, MAJOR_POS_INT, SvUV (*svp));
432 return;
433 }
434 else
435 {
436 sv_setuv (*svp, enc->shareable_idx);
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
362 else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 447 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
363 { 448 {
364 dSP; 449 dSP;
365 450
366 ENTER; SAVETMPS; PUSHMARK (SP); 451 ENTER; SAVETMPS; PUSHMARK (SP);
367 // 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
… …
399 // catch this surprisingly common error 484 // catch this surprisingly common error
400 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 485 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)); 486 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
402 487
403 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 488 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
404 encode_uint (enc, 0x80, count + 1); 489 encode_uint (enc, MAJOR_ARRAY, count + 1);
405 encode_str (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 490 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
406 491
407 while (count) 492 while (count)
408 encode_sv (enc, SP[1 - count--]); 493 encode_sv (enc, SP[1 - count--]);
409 494
410 PUTBACK; 495 PUTBACK;
… …
431{ 516{
432 double nv = SvNVX (sv); 517 double nv = SvNVX (sv);
433 518
434 need (enc, 9); 519 need (enc, 9);
435 520
436 if (ecb_expect_false (nv == (U32)nv)) 521 if (ecb_expect_false (nv == (NV)(U32)nv))
437 encode_uint (enc, 0x00, (U32)nv); 522 encode_uint (enc, MAJOR_POS_INT, (U32)nv);
438 //TODO: maybe I32? 523 //TODO: maybe I32?
439 else if (ecb_expect_false (nv == (float)nv)) 524 else if (ecb_expect_false (nv == (float)nv))
440 { 525 {
441 uint32_t fp = ecb_float_to_binary32 (nv); 526 uint32_t fp = ecb_float_to_binary32 (nv);
442 527
443 *enc->cur++ = 0xe0 | 26; 528 *enc->cur++ = MAJOR_MISC | MISC_FLOAT32;
444 529
445 if (!ecb_big_endian ()) 530 if (!ecb_big_endian ())
446 fp = ecb_bswap32 (fp); 531 fp = ecb_bswap32 (fp);
447 532
448 memcpy (enc->cur, &fp, 4); 533 memcpy (enc->cur, &fp, 4);
… …
450 } 535 }
451 else 536 else
452 { 537 {
453 uint64_t fp = ecb_double_to_binary64 (nv); 538 uint64_t fp = ecb_double_to_binary64 (nv);
454 539
455 *enc->cur++ = 0xe0 | 27; 540 *enc->cur++ = MAJOR_MISC | MISC_FLOAT64;
456 541
457 if (!ecb_big_endian ()) 542 if (!ecb_big_endian ())
458 fp = ecb_bswap64 (fp); 543 fp = ecb_bswap64 (fp);
459 544
460 memcpy (enc->cur, &fp, 8); 545 memcpy (enc->cur, &fp, 8);
… …
469 554
470 if (SvPOKp (sv)) 555 if (SvPOKp (sv))
471 { 556 {
472 STRLEN len; 557 STRLEN len;
473 char *str = SvPV (sv, len); 558 char *str = SvPV (sv, len);
474 encode_str (enc, SvUTF8 (sv), str, len); 559 encode_strref (enc, SvUTF8 (sv), str, len);
475 } 560 }
476 else if (SvNOKp (sv)) 561 else if (SvNOKp (sv))
477 encode_nv (enc, sv); 562 encode_nv (enc, sv);
478 else if (SvIOKp (sv)) 563 else if (SvIOKp (sv))
479 { 564 {
480 if (SvIsUV (sv)) 565 if (SvIsUV (sv))
481 encode_uint (enc, 0x00, SvUVX (sv)); 566 encode_uint (enc, MAJOR_POS_INT, SvUVX (sv));
482 else if (SvIVX (sv) >= 0) 567 else if (SvIVX (sv) >= 0)
483 encode_uint (enc, 0x00, SvIVX (sv)); 568 encode_uint (enc, MAJOR_POS_INT, SvIVX (sv));
484 else 569 else
485 encode_uint (enc, 0x20, -(SvIVX (sv) + 1)); 570 encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1));
486 } 571 }
487 else if (SvROK (sv)) 572 else if (SvROK (sv))
488 encode_rv (enc, SvRV (sv)); 573 encode_rv (enc, SvRV (sv));
489 else if (!SvOK (sv)) 574 else if (!SvOK (sv))
490 encode_ch (enc, 0xe0 | 22); 575 encode_ch (enc, MAJOR_MISC | SIMPLE_NULL);
491 else if (enc->cbor.flags & F_ALLOW_UNKNOWN) 576 else if (enc->cbor.flags & F_ALLOW_UNKNOWN)
492 encode_ch (enc, 0xe0 | 23); 577 encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF);
493 else 578 else
494 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",
495 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv)); 580 SvPV_nolen (sv), (unsigned int)SvFLAGS (sv));
496} 581}
497 582
… …
505 enc.cur = SvPVX (enc.sv); 590 enc.cur = SvPVX (enc.sv);
506 enc.end = SvEND (enc.sv); 591 enc.end = SvEND (enc.sv);
507 592
508 SvPOK_only (enc.sv); 593 SvPOK_only (enc.sv);
509 594
510 if (cbor->flags & (F_DEDUP_STRINGS | F_DEDUP_KEYS)) 595 if (cbor->flags & F_PACK_STRINGS)
511 { 596 {
512 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE); 597 encode_tag (&enc, CBOR_TAG_STRINGREF_NAMESPACE);
513 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ()); 598 enc.stringref[0]= (HV *)sv_2mortal ((SV *)newHV ());
514 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ()); 599 enc.stringref[1]= (HV *)sv_2mortal ((SV *)newHV ());
515 } 600 }
… …
537 CBOR cbor; 622 CBOR cbor;
538 U32 depth; // recursion depth 623 U32 depth; // recursion depth
539 U32 maxdepth; // recursion depth limit 624 U32 maxdepth; // recursion depth limit
540 AV *shareable; 625 AV *shareable;
541 AV *stringref; 626 AV *stringref;
627 SV *decode_tagged;
542} dec_t; 628} dec_t;
543 629
544#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
545 631
546#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")
… …
549#define DEC_DEC_DEPTH --dec->depth 635#define DEC_DEC_DEPTH --dec->depth
550 636
551static UV 637static UV
552decode_uint (dec_t *dec) 638decode_uint (dec_t *dec)
553{ 639{
554 switch (*dec->cur & 31) 640 U8 m = *dec->cur & MINOR_MASK;
555 { 641 ++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 642
561 case 24: 643 if (ecb_expect_true (m < LENGTH_EXT1))
644 return m;
645 else if (ecb_expect_true (m == LENGTH_EXT1))
646 {
562 WANT (2); 647 WANT (1);
563 dec->cur += 2; 648 dec->cur += 1;
564 return dec->cur[-1]; 649 return dec->cur[-1];
565 650 }
566 case 25: 651 else if (ecb_expect_true (m == LENGTH_EXT2))
652 {
567 WANT (3); 653 WANT (2);
568 dec->cur += 3; 654 dec->cur += 2;
569 return (((UV)dec->cur[-2]) << 8) 655 return (((UV)dec->cur[-2]) << 8)
570 | ((UV)dec->cur[-1]); 656 | ((UV)dec->cur[-1]);
571 657 }
572 case 26: 658 else if (ecb_expect_true (m == LENGTH_EXT4))
659 {
573 WANT (5); 660 WANT (4);
574 dec->cur += 5; 661 dec->cur += 4;
575 return (((UV)dec->cur[-4]) << 24) 662 return (((UV)dec->cur[-4]) << 24)
576 | (((UV)dec->cur[-3]) << 16) 663 | (((UV)dec->cur[-3]) << 16)
577 | (((UV)dec->cur[-2]) << 8) 664 | (((UV)dec->cur[-2]) << 8)
578 | ((UV)dec->cur[-1]); 665 | ((UV)dec->cur[-1]);
579 666 }
580 case 27: 667 else if (ecb_expect_true (m == LENGTH_EXT8))
668 {
581 WANT (9); 669 WANT (8);
582 dec->cur += 9; 670 dec->cur += 8;
671
672 return
673#if UVSIZE < 8
674 0
675#else
583 return (((UV)dec->cur[-8]) << 56) 676 (((UV)dec->cur[-8]) << 56)
584 | (((UV)dec->cur[-7]) << 48) 677 | (((UV)dec->cur[-7]) << 48)
585 | (((UV)dec->cur[-6]) << 40) 678 | (((UV)dec->cur[-6]) << 40)
586 | (((UV)dec->cur[-5]) << 32) 679 | (((UV)dec->cur[-5]) << 32)
680#endif
587 | (((UV)dec->cur[-4]) << 24) 681 | (((UV)dec->cur[-4]) << 24)
588 | (((UV)dec->cur[-3]) << 16) 682 | (((UV)dec->cur[-3]) << 16)
589 | (((UV)dec->cur[-2]) << 8) 683 | (((UV)dec->cur[-2]) << 8)
590 | ((UV)dec->cur[-1]); 684 | ((UV)dec->cur[-1]);
591 685 }
592 default: 686 else
593 ERR ("corrupted CBOR data (unsupported integer minor encoding)"); 687 ERR ("corrupted CBOR data (unsupported integer minor encoding)");
594 }
595 688
596fail: 689fail:
597 return 0; 690 return 0;
598} 691}
599 692
… …
604{ 697{
605 AV *av = newAV (); 698 AV *av = newAV ();
606 699
607 DEC_INC_DEPTH; 700 DEC_INC_DEPTH;
608 701
609 if ((*dec->cur & 31) == 31) 702 if (*dec->cur == (MAJOR_ARRAY | MINOR_INDEF))
610 { 703 {
611 ++dec->cur; 704 ++dec->cur;
612 705
613 for (;;) 706 for (;;)
614 { 707 {
615 WANT (1); 708 WANT (1);
616 709
617 if (*dec->cur == (0xe0 | 31)) 710 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
618 { 711 {
619 ++dec->cur; 712 ++dec->cur;
620 break; 713 break;
621 } 714 }
622 715
… …
625 } 718 }
626 else 719 else
627 { 720 {
628 int i, len = decode_uint (dec); 721 int i, len = decode_uint (dec);
629 722
723 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); 724 av_fill (av, len - 1);
631 725
632 for (i = 0; i < len; ++i) 726 for (i = 0; i < len; ++i)
633 AvARRAY (av)[i] = decode_sv (dec); 727 AvARRAY (av)[i] = decode_sv (dec);
634 } 728 }
… …
644 738
645static void 739static void
646decode_he (dec_t *dec, HV *hv) 740decode_he (dec_t *dec, HV *hv)
647{ 741{
648 // for speed reasons, we specialcase single-string 742 // for speed reasons, we specialcase single-string
649 // byte or utf-8 strings as keys. 743 // byte or utf-8 strings as keys, but only when !stringref
650 744
651 if (*dec->cur >= 0x40 && *dec->cur <= 0x40 + 27) 745 if (ecb_expect_true (!dec->stringref))
746 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
652 { 747 {
653 I32 len = decode_uint (dec); 748 I32 len = decode_uint (dec);
654 char *key = (char *)dec->cur; 749 char *key = (char *)dec->cur;
655 750
656 dec->cur += len; 751 dec->cur += len;
657 752
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); 753 hv_store (hv, key, len, decode_sv (dec), 0);
754
755 return;
662 } 756 }
663 else if (*dec->cur >= 0x60 && *dec->cur <= 0x60 + 27) 757 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
664 { 758 {
665 I32 len = decode_uint (dec); 759 I32 len = decode_uint (dec);
666 char *key = (char *)dec->cur; 760 char *key = (char *)dec->cur;
667 761
668 dec->cur += len; 762 dec->cur += len;
669 763
670 if (ecb_expect_false (dec->stringref)) 764 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
671 av_push (dec->stringref, newSVpvn_utf8 (key, len, 1)); 765 if (!is_utf8_string (key, len))
766 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
672 767
673 hv_store (hv, key, -len, decode_sv (dec), 0); 768 hv_store (hv, key, -len, decode_sv (dec), 0);
769
770 return;
674 } 771 }
675 else 772
676 {
677 SV *k = decode_sv (dec); 773 SV *k = decode_sv (dec);
678 SV *v = decode_sv (dec); 774 SV *v = decode_sv (dec);
679 775
680 hv_store_ent (hv, k, v, 0); 776 hv_store_ent (hv, k, v, 0);
681 SvREFCNT_dec (k); 777 SvREFCNT_dec (k);
682 } 778
779fail:
780 ;
683} 781}
684 782
685static SV * 783static SV *
686decode_hv (dec_t *dec) 784decode_hv (dec_t *dec)
687{ 785{
688 HV *hv = newHV (); 786 HV *hv = newHV ();
689 787
690 DEC_INC_DEPTH; 788 DEC_INC_DEPTH;
691 789
692 if ((*dec->cur & 31) == 31) 790 if (*dec->cur == (MAJOR_MAP | MINOR_INDEF))
693 { 791 {
694 ++dec->cur; 792 ++dec->cur;
695 793
696 for (;;) 794 for (;;)
697 { 795 {
698 WANT (1); 796 WANT (1);
699 797
700 if (*dec->cur == (0xe0 | 31)) 798 if (*dec->cur == (MAJOR_MISC | MINOR_INDEF))
701 { 799 {
702 ++dec->cur; 800 ++dec->cur;
703 break; 801 break;
704 } 802 }
705 803
… …
726static SV * 824static SV *
727decode_str (dec_t *dec, int utf8) 825decode_str (dec_t *dec, int utf8)
728{ 826{
729 SV *sv = 0; 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_catsv (sv, decode_sv (dec)); 851 STRLEN len = decode_uint (dec);
852
853 WANT (len);
854 sv_catpvn (sv, dec->cur, len);
855 dec->cur += len;
749 } 856 }
750 } 857 }
751 else 858 else
752 { 859 {
753 STRLEN len = decode_uint (dec); 860 STRLEN len = decode_uint (dec);
754 861
755 WANT (len); 862 WANT (len);
756 sv = newSVpvn (dec->cur, len); 863 sv = newSVpvn (dec->cur, len);
757 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));
758 } 869 }
759 870
760 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
761 SvUTF8_on (sv); 877 SvUTF8_on (sv);
762 878 }
763 if (ecb_expect_false (dec->stringref))
764 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
765 879
766 return sv; 880 return sv;
767 881
768fail: 882fail:
769 SvREFCNT_dec (sv); 883 SvREFCNT_dec (sv);
… …
801 } 915 }
802 break; 916 break;
803 917
804 case CBOR_TAG_STRINGREF: 918 case CBOR_TAG_STRINGREF:
805 { 919 {
806 if ((*dec->cur >> 5) != 0) 920 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
807 ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); 921 ERR ("corrupted CBOR data (stringref index not an unsigned integer)");
808 922
809 UV idx = decode_uint (dec); 923 UV idx = decode_uint (dec);
810 924
811 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) 925 if (!dec->stringref || (int)idx > AvFILLp (dec->stringref))
… …
818 case CBOR_TAG_VALUE_SHAREABLE: 932 case CBOR_TAG_VALUE_SHAREABLE:
819 { 933 {
820 if (ecb_expect_false (!dec->shareable)) 934 if (ecb_expect_false (!dec->shareable))
821 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ()); 935 dec->shareable = (AV *)sv_2mortal ((SV *)newAV ());
822 936
937 if (dec->cbor.flags & F_ALLOW_CYCLES)
938 {
823 sv = newSV (0); 939 sv = newSV (0);
824 av_push (dec->shareable, SvREFCNT_inc_NN (sv)); 940 av_push (dec->shareable, SvREFCNT_inc_NN (sv));
825 941
826 SV *osv = decode_sv (dec); 942 SV *osv = decode_sv (dec);
827 sv_setsv (sv, osv); 943 sv_setsv (sv, osv);
828 SvREFCNT_dec_NN (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 }
829 } 953 }
830 break; 954 break;
831 955
832 case CBOR_TAG_VALUE_SHAREDREF: 956 case CBOR_TAG_VALUE_SHAREDREF:
833 { 957 {
834 if ((*dec->cur >> 5) != 0) 958 if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT))
835 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); 959 ERR ("corrupted CBOR data (sharedref index not an unsigned integer)");
836 960
837 UV idx = decode_uint (dec); 961 UV idx = decode_uint (dec);
838 962
839 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) 963 if (!dec->shareable || (int)idx > AvFILLp (dec->shareable))
840 ERR ("corrupted CBOR data (sharedref index out of bounds)"); 964 ERR ("corrupted CBOR data (sharedref index out of bounds)");
841 965
842 sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); 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");
843 } 970 }
844 break; 971 break;
845 972
846 case CBOR_TAG_PERL_OBJECT: 973 case CBOR_TAG_PERL_OBJECT:
847 { 974 {
… …
896 1023
897 default: 1024 default:
898 { 1025 {
899 sv = decode_sv (dec); 1026 sv = decode_sv (dec);
900 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 {
901 AV *av = newAV (); 1051 AV *av = newAV ();
902 av_push (av, newSVuv (tag)); 1052 av_push (av, newSVuv (tag));
903 av_push (av, sv); 1053 av_push (av, sv);
904 1054
905 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash 1055 HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash
906 ? cbor_tagged_stash 1056 ? cbor_tagged_stash
907 : gv_stashpv ("CBOR::XS::Tagged" , 1); 1057 : gv_stashpv ("CBOR::XS::Tagged" , 1);
908
909 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash); 1058 sv = sv_bless (newRV_noinc ((SV *)av), tagged_stash);
1059 }
1060
1061 PUTBACK;
1062
1063 FREETMPS; LEAVE;
910 } 1064 }
911 break; 1065 break;
912 } 1066 }
913 1067
914 return sv; 1068 return sv;
… …
921static SV * 1075static SV *
922decode_sv (dec_t *dec) 1076decode_sv (dec_t *dec)
923{ 1077{
924 WANT (1); 1078 WANT (1);
925 1079
926 switch (*dec->cur >> 5) 1080 switch (*dec->cur >> MAJOR_SHIFT)
927 { 1081 {
928 case 0: // unsigned int 1082 case MAJOR_POS_INT >> MAJOR_SHIFT: return newSVuv (decode_uint (dec));
929 return newSVuv (decode_uint (dec)); 1083 case MAJOR_NEG_INT >> MAJOR_SHIFT: return newSViv (-1 - (IV)decode_uint (dec));
930 case 1: // negative int 1084 case MAJOR_BYTES >> MAJOR_SHIFT: return decode_str (dec, 0);
931 return newSViv (-1 - (IV)decode_uint (dec)); 1085 case MAJOR_TEXT >> MAJOR_SHIFT: return decode_str (dec, 1);
932 case 2: // octet string 1086 case MAJOR_ARRAY >> MAJOR_SHIFT: return decode_av (dec);
933 return decode_str (dec, 0); 1087 case MAJOR_MAP >> MAJOR_SHIFT: return decode_hv (dec);
934 case 3: // utf-8 string 1088 case MAJOR_TAG >> MAJOR_SHIFT: return decode_tagged (dec);
935 return decode_str (dec, 1); 1089
936 case 4: // array 1090 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) 1091 switch (*dec->cur++ & MINOR_MASK)
944 { 1092 {
945 case 20: 1093 case SIMPLE_FALSE:
946#if CBOR_SLOW 1094#if CBOR_SLOW
947 types_false = get_bool ("Types::Serialiser::false"); 1095 types_false = get_bool ("Types::Serialiser::false");
948#endif 1096#endif
949 return newSVsv (types_false); 1097 return newSVsv (types_false);
950 case 21: 1098 case SIMPLE_TRUE:
951#if CBOR_SLOW 1099#if CBOR_SLOW
952 types_true = get_bool ("Types::Serialiser::true"); 1100 types_true = get_bool ("Types::Serialiser::true");
953#endif 1101#endif
954 return newSVsv (types_true); 1102 return newSVsv (types_true);
955 case 22: 1103 case SIMPLE_NULL:
956 return newSVsv (&PL_sv_undef); 1104 return newSVsv (&PL_sv_undef);
957 case 23: 1105 case SIMPLE_UNDEF:
958#if CBOR_SLOW 1106#if CBOR_SLOW
959 types_error = get_bool ("Types::Serialiser::error"); 1107 types_error = get_bool ("Types::Serialiser::error");
960#endif 1108#endif
961 return newSVsv (types_error); 1109 return newSVsv (types_error);
962 1110
963 case 25: 1111 case MISC_FLOAT16:
964 { 1112 {
965 WANT (2); 1113 WANT (2);
966 1114
967 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1]; 1115 uint16_t fp = (dec->cur[0] << 8) | dec->cur[1];
968 dec->cur += 2; 1116 dec->cur += 2;
969 1117
970 return newSVnv (ecb_binary16_to_float (fp)); 1118 return newSVnv (ecb_binary16_to_float (fp));
971 } 1119 }
972 1120
973 case 26: 1121 case MISC_FLOAT32:
974 { 1122 {
975 uint32_t fp; 1123 uint32_t fp;
976 WANT (4); 1124 WANT (4);
977 memcpy (&fp, dec->cur, 4); 1125 memcpy (&fp, dec->cur, 4);
978 dec->cur += 4; 1126 dec->cur += 4;
… …
981 fp = ecb_bswap32 (fp); 1129 fp = ecb_bswap32 (fp);
982 1130
983 return newSVnv (ecb_binary32_to_float (fp)); 1131 return newSVnv (ecb_binary32_to_float (fp));
984 } 1132 }
985 1133
986 case 27: 1134 case MISC_FLOAT64:
987 { 1135 {
988 uint64_t fp; 1136 uint64_t fp;
989 WANT (8); 1137 WANT (8);
990 memcpy (&fp, dec->cur, 8); 1138 memcpy (&fp, dec->cur, 8);
991 dec->cur += 8; 1139 dec->cur += 8;
… …
994 fp = ecb_bswap64 (fp); 1142 fp = ecb_bswap64 (fp);
995 1143
996 return newSVnv (ecb_binary64_to_double (fp)); 1144 return newSVnv (ecb_binary64_to_double (fp));
997 } 1145 }
998 1146
999 // 0..19 unassigned 1147 // 0..19 unassigned simple
1000 // 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
1001 default: 1151 default:
1002 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1152 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1003 } 1153 }
1004 1154
1005 break; 1155 break;
1006 } 1156 }
1007 1157
… …
1034 if (dec.cur != dec.end && !dec.err) 1184 if (dec.cur != dec.end && !dec.err)
1035 dec.err = "garbage after CBOR object"; 1185 dec.err = "garbage after CBOR object";
1036 1186
1037 if (dec.err) 1187 if (dec.err)
1038 { 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
1039 SvREFCNT_dec (sv); 1200 SvREFCNT_dec (sv);
1040 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (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);
1041 } 1202 }
1042 1203
1043 sv = sv_2mortal (sv); 1204 sv = sv_2mortal (sv);
1044 1205
1045 return sv; 1206 return sv;
1046} 1207}
1047 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
1048///////////////////////////////////////////////////////////////////////////// 1329/////////////////////////////////////////////////////////////////////////////
1049// XS interface functions 1330// XS interface functions
1050 1331
1051MODULE = CBOR::XS PACKAGE = CBOR::XS 1332MODULE = CBOR::XS PACKAGE = CBOR::XS
1052 1333
… …
1059 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1); 1340 types_error_stash = gv_stashpv ("Types::Serialiser::Error" , 1);
1060 1341
1061 types_true = get_bool ("Types::Serialiser::true" ); 1342 types_true = get_bool ("Types::Serialiser::true" );
1062 types_false = get_bool ("Types::Serialiser::false"); 1343 types_false = get_bool ("Types::Serialiser::false");
1063 types_error = get_bool ("Types::Serialiser::error"); 1344 types_error = get_bool ("Types::Serialiser::error");
1345
1346 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1064 1347
1065 sv_cbor = newSVpv ("CBOR", 0); 1348 sv_cbor = newSVpv ("CBOR", 0);
1066 SvREADONLY_on (sv_cbor); 1349 SvREADONLY_on (sv_cbor);
1067} 1350}
1068 1351
… …
1090void shrink (CBOR *self, int enable = 1) 1373void shrink (CBOR *self, int enable = 1)
1091 ALIAS: 1374 ALIAS:
1092 shrink = F_SHRINK 1375 shrink = F_SHRINK
1093 allow_unknown = F_ALLOW_UNKNOWN 1376 allow_unknown = F_ALLOW_UNKNOWN
1094 allow_sharing = F_ALLOW_SHARING 1377 allow_sharing = F_ALLOW_SHARING
1095 dedup_keys = F_DEDUP_KEYS 1378 allow_cycles = F_ALLOW_CYCLES
1096 dedup_strings = F_DEDUP_STRINGS 1379 pack_strings = F_PACK_STRINGS
1380 validate_utf8 = F_VALIDATE_UTF8
1097 PPCODE: 1381 PPCODE:
1098{ 1382{
1099 if (enable) 1383 if (enable)
1100 self->flags |= ix; 1384 self->flags |= ix;
1101 else 1385 else
… …
1107void get_shrink (CBOR *self) 1391void get_shrink (CBOR *self)
1108 ALIAS: 1392 ALIAS:
1109 get_shrink = F_SHRINK 1393 get_shrink = F_SHRINK
1110 get_allow_unknown = F_ALLOW_UNKNOWN 1394 get_allow_unknown = F_ALLOW_UNKNOWN
1111 get_allow_sharing = F_ALLOW_SHARING 1395 get_allow_sharing = F_ALLOW_SHARING
1112 get_dedup_keys = F_DEDUP_KEYS 1396 get_allow_cycles = F_ALLOW_CYCLES
1113 get_dedup_strings = F_DEDUP_STRINGS 1397 get_pack_strings = F_PACK_STRINGS
1398 get_validate_utf8 = F_VALIDATE_UTF8
1114 PPCODE: 1399 PPCODE:
1115 XPUSHs (boolSV (self->flags & ix)); 1400 XPUSHs (boolSV (self->flags & ix));
1116 1401
1117void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1402void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1118 PPCODE: 1403 PPCODE:
… …
1131 XPUSHs (ST (0)); 1416 XPUSHs (ST (0));
1132 1417
1133int get_max_size (CBOR *self) 1418int get_max_size (CBOR *self)
1134 CODE: 1419 CODE:
1135 RETVAL = self->max_size; 1420 RETVAL = self->max_size;
1421 OUTPUT:
1422 RETVAL
1423
1424void filter (CBOR *self, SV *filter = 0)
1425 PPCODE:
1426 SvREFCNT_dec (self->filter);
1427 self->filter = filter ? newSVsv (filter) : filter;
1428 XPUSHs (ST (0));
1429
1430SV *get_filter (CBOR *self)
1431 CODE:
1432 RETVAL = self->filter ? self->filter : NEWSV (0, 0);
1136 OUTPUT: 1433 OUTPUT:
1137 RETVAL 1434 RETVAL
1138 1435
1139void encode (CBOR *self, SV *scalar) 1436void encode (CBOR *self, SV *scalar)
1140 PPCODE: 1437 PPCODE:
… …
1155 EXTEND (SP, 2); 1452 EXTEND (SP, 2);
1156 PUSHs (sv); 1453 PUSHs (sv);
1157 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1454 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1158} 1455}
1159 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
1509void DESTROY (CBOR *self)
1510 PPCODE:
1511 cbor_free (self);
1512
1160PROTOTYPES: ENABLE 1513PROTOTYPES: ENABLE
1161 1514
1162void encode_cbor (SV *scalar) 1515void encode_cbor (SV *scalar)
1516 ALIAS:
1517 encode_cbor = 0
1518 encode_cbor_sharing = F_ALLOW_SHARING
1163 PPCODE: 1519 PPCODE:
1164{ 1520{
1165 CBOR cbor; 1521 CBOR cbor;
1166 cbor_init (&cbor); 1522 cbor_init (&cbor);
1523 cbor.flags |= ix;
1167 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN; 1524 PUTBACK; scalar = encode_cbor (scalar, &cbor); SPAGAIN;
1168 XPUSHs (scalar); 1525 XPUSHs (scalar);
1169} 1526}
1170 1527
1171void decode_cbor (SV *cborstr) 1528void decode_cbor (SV *cborstr)

Diff Legend

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