… | |
… | |
6 | #include <string.h> |
6 | #include <string.h> |
7 | #include <stdlib.h> |
7 | #include <stdlib.h> |
8 | #include <stdio.h> |
8 | #include <stdio.h> |
9 | #include <limits.h> |
9 | #include <limits.h> |
10 | #include <float.h> |
10 | #include <float.h> |
|
|
11 | #include <inttypes.h> |
11 | |
12 | |
12 | #define ECB_NO_THREADS 1 |
13 | #define ECB_NO_THREADS 1 |
13 | #include "ecb.h" |
14 | #include "ecb.h" |
14 | |
15 | |
15 | // compatibility with perl <5.18 |
16 | // compatibility with perl <5.18 |
… | |
… | |
20 | # define HvNAMELEN(hv) HvNAMELEN_get (hv) |
21 | # define HvNAMELEN(hv) HvNAMELEN_get (hv) |
21 | #endif |
22 | #endif |
22 | #ifndef HvNAMEUTF8 |
23 | #ifndef HvNAMEUTF8 |
23 | # define HvNAMEUTF8(hv) 0 |
24 | # define HvNAMEUTF8(hv) 0 |
24 | #endif |
25 | #endif |
|
|
26 | #ifndef SvREFCNT_inc_NN |
|
|
27 | # define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv) |
|
|
28 | #endif |
25 | #ifndef SvREFCNT_dec_NN |
29 | #ifndef SvREFCNT_dec_NN |
26 | # define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv) |
30 | # define SvREFCNT_dec_NN(sv) SvREFCNT_dec (sv) |
27 | #endif |
31 | #endif |
|
|
32 | |
|
|
33 | // perl's is_utf8_string interprets len=0 as "calculate len", but we want it to mean 0 |
|
|
34 | #define cbor_is_utf8_string(str,len) (!(len) || is_utf8_string ((str), (len))) |
28 | |
35 | |
29 | // known major and minor types |
36 | // known major and minor types |
30 | enum cbor_type |
37 | enum cbor_type |
31 | { |
38 | { |
32 | MAJOR_SHIFT = 5, |
39 | MAJOR_SHIFT = 5, |
… | |
… | |
95 | CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 |
102 | CBOR_TAG_MIME = 36, // mime message rfc2045, utf-8 |
96 | |
103 | |
97 | CBOR_TAG_MAGIC = 55799, // self-describe cbor |
104 | CBOR_TAG_MAGIC = 55799, // self-describe cbor |
98 | }; |
105 | }; |
99 | |
106 | |
|
|
107 | // known forced types, also hardcoded in CBOR.pm |
|
|
108 | enum |
|
|
109 | { |
|
|
110 | AS_CBOR = 0, |
|
|
111 | AS_INT = 1, |
|
|
112 | AS_BYTES = 2, |
|
|
113 | AS_TEXT = 3, |
|
|
114 | AS_FLOAT16 = 4, |
|
|
115 | AS_FLOAT32 = 5, |
|
|
116 | AS_FLOAT64 = 6, |
|
|
117 | AS_MAP = 7, |
|
|
118 | // possibly future enhancements: (generic) float, (generic) string |
|
|
119 | }; |
|
|
120 | |
100 | #define F_SHRINK 0x00000001UL |
121 | #define F_SHRINK 0x00000001UL |
101 | #define F_ALLOW_UNKNOWN 0x00000002UL |
122 | #define F_ALLOW_UNKNOWN 0x00000002UL |
102 | #define F_ALLOW_SHARING 0x00000004UL |
123 | #define F_ALLOW_SHARING 0x00000004UL |
103 | #define F_ALLOW_CYCLES 0x00000008UL |
124 | #define F_ALLOW_CYCLES 0x00000008UL |
|
|
125 | #define F_FORBID_OBJECTS 0x00000010UL |
104 | #define F_PACK_STRINGS 0x00000010UL |
126 | #define F_PACK_STRINGS 0x00000020UL |
|
|
127 | #define F_TEXT_KEYS 0x00000040UL |
|
|
128 | #define F_TEXT_STRINGS 0x00000080UL |
105 | #define F_VALIDATE_UTF8 0x00000020UL |
129 | #define F_VALIDATE_UTF8 0x00000100UL |
106 | |
130 | |
107 | #define INIT_SIZE 32 // initial scalar size to be allocated |
131 | #define INIT_SIZE 32 // initial scalar size to be allocated |
108 | |
132 | |
109 | #define SB do { |
133 | #define SB do { |
110 | #define SE } while (0) |
134 | #define SE } while (0) |
… | |
… | |
180 | #endif |
204 | #endif |
181 | } |
205 | } |
182 | } |
206 | } |
183 | |
207 | |
184 | // minimum length of a string to be registered for stringref |
208 | // minimum length of a string to be registered for stringref |
185 | ecb_inline int |
209 | ecb_inline STRLEN |
186 | minimum_string_length (UV idx) |
210 | minimum_string_length (UV idx) |
187 | { |
211 | { |
188 | return idx > 23 |
212 | return idx <= 23 ? 3 |
189 | ? idx > 0xffU |
213 | : idx <= 0xffU ? 4 |
190 | ? idx > 0xffffU |
214 | : idx <= 0xffffU ? 5 |
191 | ? idx > 0xffffffffU |
215 | : idx <= 0xffffffffU ? 7 |
192 | ? 11 |
216 | : 11; |
193 | : 7 |
|
|
194 | : 5 |
|
|
195 | : 4 |
|
|
196 | : 3; |
|
|
197 | } |
217 | } |
198 | |
218 | |
199 | ///////////////////////////////////////////////////////////////////////////// |
219 | ///////////////////////////////////////////////////////////////////////////// |
200 | // encoder |
220 | // encoder |
201 | |
221 | |
… | |
… | |
214 | } enc_t; |
234 | } enc_t; |
215 | |
235 | |
216 | ecb_inline void |
236 | ecb_inline void |
217 | need (enc_t *enc, STRLEN len) |
237 | need (enc_t *enc, STRLEN len) |
218 | { |
238 | { |
219 | if (ecb_expect_false (enc->cur + len >= enc->end)) |
239 | if (ecb_expect_false ((uintptr_t)(enc->end - enc->cur) < len)) |
220 | { |
240 | { |
221 | STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); |
241 | STRLEN cur = enc->cur - (char *)SvPVX (enc->sv); |
222 | SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); |
242 | SvGROW (enc->sv, cur + (len < (cur >> 2) ? cur >> 2 : len) + 1); |
223 | enc->cur = SvPVX (enc->sv) + cur; |
243 | enc->cur = SvPVX (enc->sv) + cur; |
224 | enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; |
244 | enc->end = SvPVX (enc->sv) + SvLEN (enc->sv) - 1; |
225 | } |
245 | } |
226 | } |
246 | } |
227 | |
247 | |
|
|
248 | static void encode_sv (enc_t *enc, SV *sv); |
|
|
249 | |
228 | ecb_inline void |
250 | ecb_inline void |
229 | encode_ch (enc_t *enc, char ch) |
251 | encode_ch (enc_t *enc, char ch) |
230 | { |
252 | { |
231 | need (enc, 1); |
253 | need (enc, 1); |
232 | *enc->cur++ = ch; |
254 | *enc->cur++ = ch; |
233 | } |
255 | } |
234 | |
256 | |
|
|
257 | // used for tags, intregers, element counts and so on |
235 | static void |
258 | static void |
236 | encode_uint (enc_t *enc, int major, UV len) |
259 | encode_uint (enc_t *enc, int major, UV len) |
237 | { |
260 | { |
238 | need (enc, 9); |
261 | need (enc, 9); |
239 | |
262 | |
… | |
… | |
270 | *enc->cur++ = len >> 8; |
293 | *enc->cur++ = len >> 8; |
271 | *enc->cur++ = len; |
294 | *enc->cur++ = len; |
272 | } |
295 | } |
273 | } |
296 | } |
274 | |
297 | |
|
|
298 | // encodes a perl value into a CBOR integer |
|
|
299 | ecb_inline void |
|
|
300 | encode_int (enc_t *enc, SV *sv) |
|
|
301 | { |
|
|
302 | if (SvIsUV (sv)) |
|
|
303 | encode_uint (enc, MAJOR_POS_INT, SvUVX (sv)); |
|
|
304 | else if (SvIVX (sv) >= 0) |
|
|
305 | encode_uint (enc, MAJOR_POS_INT, SvIVX (sv)); |
|
|
306 | else |
|
|
307 | encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1)); |
|
|
308 | } |
|
|
309 | |
275 | ecb_inline void |
310 | ecb_inline void |
276 | encode_tag (enc_t *enc, UV tag) |
311 | encode_tag (enc_t *enc, UV tag) |
277 | { |
312 | { |
278 | encode_uint (enc, MAJOR_TAG, tag); |
313 | encode_uint (enc, MAJOR_TAG, tag); |
279 | } |
314 | } |
280 | |
315 | |
|
|
316 | // exceptional (hopefully) slow path for byte strings that need to be utf8-encoded |
|
|
317 | ecb_noinline static void |
|
|
318 | encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len) |
|
|
319 | { |
|
|
320 | STRLEN ulen = len; |
|
|
321 | U8 *p, *pend = (U8 *)str + len; |
|
|
322 | |
|
|
323 | for (p = (U8 *)str; p < pend; ++p) |
|
|
324 | ulen += *p >> 7; // count set high bits |
|
|
325 | |
|
|
326 | encode_uint (enc, MAJOR_TEXT, ulen); |
|
|
327 | |
|
|
328 | need (enc, ulen); |
|
|
329 | for (p = (U8 *)str; p < pend; ++p) |
|
|
330 | if (*p < 0x80) |
|
|
331 | *enc->cur++ = *p; |
|
|
332 | else |
|
|
333 | { |
|
|
334 | *enc->cur++ = 0xc0 + (*p >> 6); |
|
|
335 | *enc->cur++ = 0x80 + (*p & 63); |
|
|
336 | } |
|
|
337 | } |
|
|
338 | |
281 | ecb_inline void |
339 | ecb_inline void |
282 | encode_str (enc_t *enc, int utf8, char *str, STRLEN len) |
340 | encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len) |
283 | { |
341 | { |
|
|
342 | if (ecb_expect_false (upgrade_utf8)) |
|
|
343 | if (!utf8) |
|
|
344 | { |
|
|
345 | encode_str_utf8 (enc, utf8, str, len); |
|
|
346 | return; |
|
|
347 | } |
|
|
348 | |
284 | encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); |
349 | encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); |
285 | need (enc, len); |
350 | need (enc, len); |
286 | memcpy (enc->cur, str, len); |
351 | memcpy (enc->cur, str, len); |
287 | enc->cur += len; |
352 | enc->cur += len; |
288 | } |
353 | } |
289 | |
354 | |
290 | static void |
355 | ecb_inline void |
291 | encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) |
356 | encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len) |
292 | { |
357 | { |
293 | if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) |
358 | if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) |
294 | { |
359 | { |
295 | SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); |
360 | SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); |
296 | |
361 | |
… | |
… | |
307 | sv_setuv (*svp, enc->stringref_idx); |
372 | sv_setuv (*svp, enc->stringref_idx); |
308 | ++enc->stringref_idx; |
373 | ++enc->stringref_idx; |
309 | } |
374 | } |
310 | } |
375 | } |
311 | |
376 | |
312 | encode_str (enc, utf8, str, len); |
377 | encode_str (enc, upgrade_utf8, utf8, str, len); |
313 | } |
378 | } |
314 | |
379 | |
315 | static void encode_sv (enc_t *enc, SV *sv); |
380 | ecb_inline void |
|
|
381 | encode_float16 (enc_t *enc, NV nv) |
|
|
382 | { |
|
|
383 | need (enc, 1+2); |
|
|
384 | |
|
|
385 | *enc->cur++ = MAJOR_MISC | MISC_FLOAT16; |
|
|
386 | |
|
|
387 | uint16_t fp = ecb_float_to_binary16 (nv); |
|
|
388 | |
|
|
389 | if (!ecb_big_endian ()) |
|
|
390 | fp = ecb_bswap16 (fp); |
|
|
391 | |
|
|
392 | memcpy (enc->cur, &fp, 2); |
|
|
393 | enc->cur += 2; |
|
|
394 | } |
|
|
395 | |
|
|
396 | ecb_inline void |
|
|
397 | encode_float32 (enc_t *enc, NV nv) |
|
|
398 | { |
|
|
399 | need (enc, 1+4); |
|
|
400 | |
|
|
401 | *enc->cur++ = MAJOR_MISC | MISC_FLOAT32; |
|
|
402 | |
|
|
403 | uint32_t fp = ecb_float_to_binary32 (nv); |
|
|
404 | |
|
|
405 | if (!ecb_big_endian ()) |
|
|
406 | fp = ecb_bswap32 (fp); |
|
|
407 | |
|
|
408 | memcpy (enc->cur, &fp, 4); |
|
|
409 | enc->cur += 4; |
|
|
410 | } |
|
|
411 | |
|
|
412 | ecb_inline void |
|
|
413 | encode_float64 (enc_t *enc, NV nv) |
|
|
414 | { |
|
|
415 | need (enc, 1+8); |
|
|
416 | |
|
|
417 | *enc->cur++ = MAJOR_MISC | MISC_FLOAT64; |
|
|
418 | |
|
|
419 | uint64_t fp = ecb_double_to_binary64 (nv); |
|
|
420 | |
|
|
421 | if (!ecb_big_endian ()) |
|
|
422 | fp = ecb_bswap64 (fp); |
|
|
423 | |
|
|
424 | memcpy (enc->cur, &fp, 8); |
|
|
425 | enc->cur += 8; |
|
|
426 | } |
|
|
427 | |
|
|
428 | ecb_inline void |
|
|
429 | encode_bool (enc_t *enc, int istrue) |
|
|
430 | { |
|
|
431 | encode_ch (enc, istrue ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE); |
|
|
432 | } |
|
|
433 | |
|
|
434 | // encodes an arrayref containing key-value pairs as CBOR map |
|
|
435 | ecb_inline void |
|
|
436 | encode_array_as_map (enc_t *enc, SV *sv) |
|
|
437 | { |
|
|
438 | if (enc->depth >= enc->cbor.max_depth) |
|
|
439 | croak (ERR_NESTING_EXCEEDED); |
|
|
440 | |
|
|
441 | ++enc->depth; |
|
|
442 | |
|
|
443 | // as_map does error checking for us, but we re-check in case |
|
|
444 | // things have changed. |
|
|
445 | |
|
|
446 | if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) |
|
|
447 | croak ("CBOR::XS::as_map requires an array reference (did you change the array after calling as_map?)"); |
|
|
448 | |
|
|
449 | AV *av = (AV *)SvRV (sv); |
|
|
450 | int i, len = av_len (av); |
|
|
451 | |
|
|
452 | if (!(len & 1)) |
|
|
453 | croak ("CBOR::XS::as_map requires an even number of elements (did you change the array after calling as_map?)"); |
|
|
454 | |
|
|
455 | encode_uint (enc, MAJOR_MAP, (len + 1) >> 1); |
|
|
456 | |
|
|
457 | for (i = 0; i <= len; ++i) |
|
|
458 | { |
|
|
459 | SV **svp = av_fetch (av, i, 0); |
|
|
460 | encode_sv (enc, svp ? *svp : &PL_sv_undef); |
|
|
461 | } |
|
|
462 | |
|
|
463 | --enc->depth; |
|
|
464 | } |
|
|
465 | |
|
|
466 | ecb_inline void |
|
|
467 | encode_forced (enc_t *enc, UV type, SV *sv) |
|
|
468 | { |
|
|
469 | switch (type) |
|
|
470 | { |
|
|
471 | case AS_CBOR: |
|
|
472 | { |
|
|
473 | STRLEN len; |
|
|
474 | char *str = SvPVbyte (sv, len); |
|
|
475 | |
|
|
476 | need (enc, len); |
|
|
477 | memcpy (enc->cur, str, len); |
|
|
478 | enc->cur += len; |
|
|
479 | } |
|
|
480 | break; |
|
|
481 | |
|
|
482 | case AS_BYTES: |
|
|
483 | { |
|
|
484 | STRLEN len; |
|
|
485 | char *str = SvPVbyte (sv, len); |
|
|
486 | encode_strref (enc, 0, 0, str, len); |
|
|
487 | } |
|
|
488 | break; |
|
|
489 | |
|
|
490 | case AS_TEXT: |
|
|
491 | { |
|
|
492 | STRLEN len; |
|
|
493 | char *str = SvPVutf8 (sv, len); |
|
|
494 | encode_strref (enc, 1, 1, str, len); |
|
|
495 | } |
|
|
496 | break; |
|
|
497 | |
|
|
498 | case AS_INT: encode_int (enc, sv); break; |
|
|
499 | |
|
|
500 | case AS_FLOAT16: encode_float16 (enc, SvNV (sv)); break; |
|
|
501 | case AS_FLOAT32: encode_float32 (enc, SvNV (sv)); break; |
|
|
502 | case AS_FLOAT64: encode_float64 (enc, SvNV (sv)); break; |
|
|
503 | |
|
|
504 | case AS_MAP: encode_array_as_map (enc, sv); break; |
|
|
505 | |
|
|
506 | default: |
|
|
507 | croak ("encountered malformed CBOR::XS::Tagged object"); |
|
|
508 | } |
|
|
509 | } |
316 | |
510 | |
317 | static void |
511 | static void |
318 | encode_av (enc_t *enc, AV *av) |
512 | encode_av (enc_t *enc, AV *av) |
319 | { |
513 | { |
320 | int i, len = av_len (av); |
514 | int i, len = av_len (av); |
… | |
… | |
324 | |
518 | |
325 | ++enc->depth; |
519 | ++enc->depth; |
326 | |
520 | |
327 | encode_uint (enc, MAJOR_ARRAY, len + 1); |
521 | encode_uint (enc, MAJOR_ARRAY, len + 1); |
328 | |
522 | |
329 | if (SvMAGICAL (av)) |
523 | if (ecb_expect_false (SvMAGICAL (av))) |
330 | for (i = 0; i <= len; ++i) |
524 | for (i = 0; i <= len; ++i) |
331 | { |
525 | { |
332 | SV **svp = av_fetch (av, i, 0); |
526 | SV **svp = av_fetch (av, i, 0); |
333 | encode_sv (enc, svp ? *svp : &PL_sv_undef); |
527 | encode_sv (enc, svp ? *svp : &PL_sv_undef); |
334 | } |
528 | } |
… | |
… | |
353 | ++enc->depth; |
547 | ++enc->depth; |
354 | |
548 | |
355 | int pairs = hv_iterinit (hv); |
549 | int pairs = hv_iterinit (hv); |
356 | int mg = SvMAGICAL (hv); |
550 | int mg = SvMAGICAL (hv); |
357 | |
551 | |
358 | if (mg) |
552 | if (ecb_expect_false (mg)) |
359 | encode_ch (enc, MAJOR_MAP | MINOR_INDEF); |
553 | encode_ch (enc, MAJOR_MAP | MINOR_INDEF); |
360 | else |
554 | else |
361 | encode_uint (enc, MAJOR_MAP, pairs); |
555 | encode_uint (enc, MAJOR_MAP, pairs); |
362 | |
556 | |
363 | while ((he = hv_iternext (hv))) |
557 | while ((he = hv_iternext (hv))) |
364 | { |
558 | { |
365 | if (HeKLEN (he) == HEf_SVKEY) |
559 | if (HeKLEN (he) == HEf_SVKEY) |
366 | encode_sv (enc, HeSVKEY (he)); |
560 | encode_sv (enc, HeSVKEY (he)); |
367 | else |
561 | else |
368 | encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); |
562 | encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he)); |
369 | |
563 | |
370 | encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); |
564 | encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); |
371 | } |
565 | } |
372 | |
566 | |
373 | if (mg) |
567 | if (ecb_expect_false (mg)) |
374 | encode_ch (enc, MAJOR_MISC | MINOR_INDEF); |
568 | encode_ch (enc, MAJOR_MISC | MINOR_INDEF); |
375 | |
569 | |
376 | --enc->depth; |
570 | --enc->depth; |
377 | } |
571 | } |
378 | |
572 | |
… | |
… | |
398 | |
592 | |
399 | HV *stash = SvSTASH (sv); |
593 | HV *stash = SvSTASH (sv); |
400 | |
594 | |
401 | if (stash == boolean_stash) |
595 | if (stash == boolean_stash) |
402 | { |
596 | { |
403 | encode_ch (enc, SvIV (sv) ? MAJOR_MISC | SIMPLE_TRUE : MAJOR_MISC | SIMPLE_FALSE); |
597 | encode_bool (enc, SvIV (sv)); |
404 | return; |
598 | return; |
405 | } |
599 | } |
406 | else if (stash == error_stash) |
600 | else if (stash == error_stash) |
407 | { |
601 | { |
408 | encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF); |
602 | encode_ch (enc, MAJOR_MISC | SIMPLE_UNDEF); |
… | |
… | |
411 | else if (stash == tagged_stash) |
605 | else if (stash == tagged_stash) |
412 | { |
606 | { |
413 | if (svt != SVt_PVAV) |
607 | if (svt != SVt_PVAV) |
414 | croak ("encountered CBOR::XS::Tagged object that isn't an array"); |
608 | croak ("encountered CBOR::XS::Tagged object that isn't an array"); |
415 | |
609 | |
|
|
610 | switch (av_len ((AV *)sv)) |
|
|
611 | { |
|
|
612 | case 2-1: |
|
|
613 | // actually a tagged value |
416 | encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); |
614 | encode_uint (enc, MAJOR_TAG, SvUV (*av_fetch ((AV *)sv, 0, 1))); |
417 | encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); |
615 | encode_sv (enc, *av_fetch ((AV *)sv, 1, 1)); |
|
|
616 | break; |
|
|
617 | |
|
|
618 | case 3-1: |
|
|
619 | // a forced type [value, type, undef] |
|
|
620 | encode_forced (enc, SvUV (*av_fetch ((AV *)sv, 1, 1)), *av_fetch ((AV *)sv, 0, 1)); |
|
|
621 | break; |
|
|
622 | |
|
|
623 | default: |
|
|
624 | croak ("encountered malformed CBOR::XS::Tagged object"); |
|
|
625 | } |
418 | |
626 | |
419 | return; |
627 | return; |
420 | } |
628 | } |
421 | } |
629 | } |
422 | |
630 | |
423 | if (ecb_expect_false (SvREFCNT (sv) > 1) |
631 | if (ecb_expect_false (SvREFCNT (sv) > 1) |
424 | && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) |
632 | && ecb_expect_false (enc->cbor.flags & F_ALLOW_SHARING)) |
425 | { |
633 | { |
426 | if (!enc->shareable) |
634 | if (ecb_expect_false (!enc->shareable)) |
427 | enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); |
635 | enc->shareable = (HV *)sv_2mortal ((SV *)newHV ()); |
428 | |
636 | |
429 | SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); |
637 | SV **svp = hv_fetch (enc->shareable, (char *)&sv, sizeof (sv), 1); |
430 | |
638 | |
431 | if (SvOK (*svp)) |
639 | if (SvOK (*svp)) |
… | |
… | |
445 | if (ecb_expect_false (SvOBJECT (sv))) |
653 | if (ecb_expect_false (SvOBJECT (sv))) |
446 | { |
654 | { |
447 | HV *stash = SvSTASH (sv); |
655 | HV *stash = SvSTASH (sv); |
448 | GV *method; |
656 | GV *method; |
449 | |
657 | |
|
|
658 | if (enc->cbor.flags & F_FORBID_OBJECTS) |
|
|
659 | croak ("encountered object '%s', but forbid_objects is enabled", |
|
|
660 | SvPV_nolen (sv_2mortal (newRV_inc (sv)))); |
450 | if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) |
661 | else if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) |
451 | { |
662 | { |
452 | dSP; |
663 | dSP; |
453 | |
664 | |
454 | ENTER; SAVETMPS; PUSHMARK (SP); |
665 | ENTER; SAVETMPS; |
|
|
666 | PUSHMARK (SP); |
455 | // we re-bless the reference to get overload and other niceties right |
667 | // we re-bless the reference to get overload and other niceties right |
456 | XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
668 | XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
457 | |
669 | |
458 | PUTBACK; |
670 | PUTBACK; |
459 | // G_SCALAR ensures that return value is 1 |
671 | // G_SCALAR ensures that return value is 1 |
… | |
… | |
472 | } |
684 | } |
473 | else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) |
685 | else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) |
474 | { |
686 | { |
475 | dSP; |
687 | dSP; |
476 | |
688 | |
477 | ENTER; SAVETMPS; PUSHMARK (SP); |
689 | ENTER; SAVETMPS; |
|
|
690 | PUSHMARK (SP); |
478 | EXTEND (SP, 2); |
691 | EXTEND (SP, 2); |
479 | // we re-bless the reference to get overload and other niceties right |
692 | // we re-bless the reference to get overload and other niceties right |
480 | PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
693 | PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); |
481 | PUSHs (sv_cbor); |
694 | PUSHs (sv_cbor); |
482 | |
695 | |
… | |
… | |
488 | if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) |
701 | if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) |
489 | croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); |
702 | croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); |
490 | |
703 | |
491 | encode_tag (enc, CBOR_TAG_PERL_OBJECT); |
704 | encode_tag (enc, CBOR_TAG_PERL_OBJECT); |
492 | encode_uint (enc, MAJOR_ARRAY, count + 1); |
705 | encode_uint (enc, MAJOR_ARRAY, count + 1); |
493 | encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); |
706 | encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); |
494 | |
707 | |
495 | while (count) |
708 | { |
|
|
709 | int i; |
|
|
710 | |
|
|
711 | for (i = 0; i < count; ++i) |
496 | encode_sv (enc, SP[1 - count--]); |
712 | encode_sv (enc, SP[i + 1 - count]); |
|
|
713 | |
|
|
714 | SP -= count; |
|
|
715 | } |
497 | |
716 | |
498 | PUTBACK; |
717 | PUTBACK; |
499 | |
718 | |
500 | FREETMPS; LEAVE; |
719 | FREETMPS; LEAVE; |
501 | } |
720 | } |
… | |
… | |
523 | |
742 | |
524 | if (ecb_expect_false (nv == (NV)(U32)nv)) |
743 | if (ecb_expect_false (nv == (NV)(U32)nv)) |
525 | encode_uint (enc, MAJOR_POS_INT, (U32)nv); |
744 | encode_uint (enc, MAJOR_POS_INT, (U32)nv); |
526 | //TODO: maybe I32? |
745 | //TODO: maybe I32? |
527 | else if (ecb_expect_false (nv == (float)nv)) |
746 | else if (ecb_expect_false (nv == (float)nv)) |
528 | { |
747 | encode_float32 (enc, nv); |
529 | uint32_t fp = ecb_float_to_binary32 (nv); |
|
|
530 | |
|
|
531 | *enc->cur++ = MAJOR_MISC | MISC_FLOAT32; |
|
|
532 | |
|
|
533 | if (!ecb_big_endian ()) |
|
|
534 | fp = ecb_bswap32 (fp); |
|
|
535 | |
|
|
536 | memcpy (enc->cur, &fp, 4); |
|
|
537 | enc->cur += 4; |
|
|
538 | } |
|
|
539 | else |
748 | else |
540 | { |
749 | encode_float64 (enc, nv); |
541 | uint64_t fp = ecb_double_to_binary64 (nv); |
|
|
542 | |
|
|
543 | *enc->cur++ = MAJOR_MISC | MISC_FLOAT64; |
|
|
544 | |
|
|
545 | if (!ecb_big_endian ()) |
|
|
546 | fp = ecb_bswap64 (fp); |
|
|
547 | |
|
|
548 | memcpy (enc->cur, &fp, 8); |
|
|
549 | enc->cur += 8; |
|
|
550 | } |
|
|
551 | } |
750 | } |
552 | |
751 | |
553 | static void |
752 | static void |
554 | encode_sv (enc_t *enc, SV *sv) |
753 | encode_sv (enc_t *enc, SV *sv) |
555 | { |
754 | { |
… | |
… | |
557 | |
756 | |
558 | if (SvPOKp (sv)) |
757 | if (SvPOKp (sv)) |
559 | { |
758 | { |
560 | STRLEN len; |
759 | STRLEN len; |
561 | char *str = SvPV (sv, len); |
760 | char *str = SvPV (sv, len); |
562 | encode_strref (enc, SvUTF8 (sv), str, len); |
761 | encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len); |
563 | } |
762 | } |
564 | else if (SvNOKp (sv)) |
763 | else if (SvNOKp (sv)) |
565 | encode_nv (enc, sv); |
764 | encode_nv (enc, sv); |
566 | else if (SvIOKp (sv)) |
765 | else if (SvIOKp (sv)) |
567 | { |
766 | encode_int (enc, sv); |
568 | if (SvIsUV (sv)) |
|
|
569 | encode_uint (enc, MAJOR_POS_INT, SvUVX (sv)); |
|
|
570 | else if (SvIVX (sv) >= 0) |
|
|
571 | encode_uint (enc, MAJOR_POS_INT, SvIVX (sv)); |
|
|
572 | else |
|
|
573 | encode_uint (enc, MAJOR_NEG_INT, -(SvIVX (sv) + 1)); |
|
|
574 | } |
|
|
575 | else if (SvROK (sv)) |
767 | else if (SvROK (sv)) |
576 | encode_rv (enc, SvRV (sv)); |
768 | encode_rv (enc, SvRV (sv)); |
577 | else if (!SvOK (sv)) |
769 | else if (!SvOK (sv)) |
578 | encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); |
770 | encode_ch (enc, MAJOR_MISC | SIMPLE_NULL); |
579 | else if (enc->cbor.flags & F_ALLOW_UNKNOWN) |
771 | else if (enc->cbor.flags & F_ALLOW_UNKNOWN) |
… | |
… | |
586 | static SV * |
778 | static SV * |
587 | encode_cbor (SV *scalar, CBOR *cbor) |
779 | encode_cbor (SV *scalar, CBOR *cbor) |
588 | { |
780 | { |
589 | enc_t enc = { 0 }; |
781 | enc_t enc = { 0 }; |
590 | |
782 | |
591 | enc.cbor = *cbor; |
783 | enc.cbor = *cbor; |
592 | enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); |
784 | enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); |
593 | enc.cur = SvPVX (enc.sv); |
785 | enc.cur = SvPVX (enc.sv); |
594 | enc.end = SvEND (enc.sv); |
786 | enc.end = SvEND (enc.sv); |
595 | |
787 | |
596 | SvPOK_only (enc.sv); |
788 | SvPOK_only (enc.sv); |
597 | |
789 | |
598 | if (cbor->flags & F_PACK_STRINGS) |
790 | if (cbor->flags & F_PACK_STRINGS) |
599 | { |
791 | { |
… | |
… | |
626 | U32 depth; // recursion depth |
818 | U32 depth; // recursion depth |
627 | U32 maxdepth; // recursion depth limit |
819 | U32 maxdepth; // recursion depth limit |
628 | AV *shareable; |
820 | AV *shareable; |
629 | AV *stringref; |
821 | AV *stringref; |
630 | SV *decode_tagged; |
822 | SV *decode_tagged; |
|
|
823 | SV *err_sv; // optional sv for error, needs to be freed |
631 | } dec_t; |
824 | } dec_t; |
632 | |
825 | |
633 | #define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE |
826 | // set dec->err to ERRSV |
|
|
827 | ecb_cold static void |
|
|
828 | err_errsv (dec_t *dec) |
|
|
829 | { |
|
|
830 | if (!dec->err) |
|
|
831 | { |
|
|
832 | dec->err_sv = newSVsv (ERRSV); |
634 | |
833 | |
635 | #define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") |
834 | // chop off the trailing \n |
|
|
835 | SvCUR_set (dec->err_sv, SvCUR (dec->err_sv) - 1); |
|
|
836 | *SvEND (dec->err_sv) = 0; |
636 | |
837 | |
|
|
838 | dec->err = SvPVutf8_nolen (dec->err_sv); |
|
|
839 | } |
|
|
840 | } |
|
|
841 | |
|
|
842 | // the following functions are used to reduce code size and help the compiler to optimise |
|
|
843 | ecb_cold static void |
|
|
844 | err_set (dec_t *dec, const char *reason) |
|
|
845 | { |
|
|
846 | if (!dec->err) |
|
|
847 | dec->err = reason; |
|
|
848 | } |
|
|
849 | |
|
|
850 | ecb_cold static void |
|
|
851 | err_unexpected_end (dec_t *dec) |
|
|
852 | { |
|
|
853 | err_set (dec, "unexpected end of CBOR data"); |
|
|
854 | } |
|
|
855 | |
|
|
856 | #define ERR_DO(do) SB do; goto fail; SE |
|
|
857 | #define ERR(reason) ERR_DO (err_set (dec, reason)) |
|
|
858 | #define ERR_ERRSV ERR_DO (err_errsv (dec)) |
|
|
859 | |
|
|
860 | #define WANT(len) if (ecb_expect_false ((uintptr_t)(dec->end - dec->cur) < (STRLEN)len)) ERR_DO (err_unexpected_end (dec)) |
|
|
861 | |
637 | #define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) |
862 | #define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED) |
638 | #define DEC_DEC_DEPTH --dec->depth |
863 | #define DEC_DEC_DEPTH --dec->depth |
639 | |
864 | |
640 | static UV |
865 | static UV |
641 | decode_uint (dec_t *dec) |
866 | decode_uint (dec_t *dec) |
642 | { |
867 | { |
… | |
… | |
708 | |
933 | |
709 | for (;;) |
934 | for (;;) |
710 | { |
935 | { |
711 | WANT (1); |
936 | WANT (1); |
712 | |
937 | |
713 | if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) |
938 | if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err) |
714 | { |
939 | { |
715 | ++dec->cur; |
940 | ++dec->cur; |
716 | break; |
941 | break; |
717 | } |
942 | } |
718 | |
943 | |
719 | av_push (av, decode_sv (dec)); |
944 | av_push (av, decode_sv (dec)); |
720 | } |
945 | } |
721 | } |
946 | } |
722 | else |
947 | else |
723 | { |
948 | { |
724 | int i, len = decode_uint (dec); |
949 | UV i, len = decode_uint (dec); |
725 | |
950 | |
726 | WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays |
951 | WANT (len); // complexity check for av_fill - need at least one byte per value, do not allow supersize arrays |
727 | av_fill (av, len - 1); |
952 | av_fill (av, len - 1); |
728 | |
953 | |
729 | for (i = 0; i < len; ++i) |
954 | for (i = 0; i < len; ++i) |
… | |
… | |
732 | |
957 | |
733 | DEC_DEC_DEPTH; |
958 | DEC_DEC_DEPTH; |
734 | return newRV_noinc ((SV *)av); |
959 | return newRV_noinc ((SV *)av); |
735 | |
960 | |
736 | fail: |
961 | fail: |
737 | SvREFCNT_dec (av); |
962 | SvREFCNT_dec_NN (av); |
738 | DEC_DEC_DEPTH; |
963 | DEC_DEC_DEPTH; |
739 | return &PL_sv_undef; |
964 | return &PL_sv_undef; |
740 | } |
965 | } |
741 | |
966 | |
742 | static void |
967 | static void |
… | |
… | |
746 | // byte or utf-8 strings as keys, but only when !stringref |
971 | // byte or utf-8 strings as keys, but only when !stringref |
747 | |
972 | |
748 | if (ecb_expect_true (!dec->stringref)) |
973 | if (ecb_expect_true (!dec->stringref)) |
749 | if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) |
974 | if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) |
750 | { |
975 | { |
751 | I32 len = decode_uint (dec); |
976 | STRLEN len = decode_uint (dec); |
752 | char *key = (char *)dec->cur; |
977 | char *key = (char *)dec->cur; |
753 | |
978 | |
|
|
979 | WANT (len); |
754 | dec->cur += len; |
980 | dec->cur += len; |
755 | |
981 | |
756 | hv_store (hv, key, len, decode_sv (dec), 0); |
982 | hv_store (hv, key, len, decode_sv (dec), 0); |
757 | |
983 | |
758 | return; |
984 | return; |
759 | } |
985 | } |
760 | else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) |
986 | else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) |
761 | { |
987 | { |
762 | I32 len = decode_uint (dec); |
988 | STRLEN len = decode_uint (dec); |
763 | char *key = (char *)dec->cur; |
989 | char *key = (char *)dec->cur; |
764 | |
990 | |
|
|
991 | WANT (len); |
765 | dec->cur += len; |
992 | dec->cur += len; |
766 | |
993 | |
767 | if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) |
994 | if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) |
768 | if (!is_utf8_string (key, len)) |
995 | if (!cbor_is_utf8_string ((U8 *)key, len)) |
769 | ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); |
996 | ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); |
770 | |
997 | |
771 | hv_store (hv, key, -len, decode_sv (dec), 0); |
998 | hv_store (hv, key, -len, decode_sv (dec), 0); |
772 | |
999 | |
773 | return; |
1000 | return; |
774 | } |
1001 | } |
775 | |
1002 | |
776 | SV *k = decode_sv (dec); |
1003 | SV *k = decode_sv (dec); |
777 | SV *v = decode_sv (dec); |
1004 | SV *v = decode_sv (dec); |
778 | |
1005 | |
|
|
1006 | // we leak memory if uncaught exceptions are thrown by random magical |
|
|
1007 | // methods, and this is hopefully the only place where it can happen, |
|
|
1008 | // so if there is a chance of an exception, take the very slow path. |
|
|
1009 | // since catching exceptions is "undocumented/internal/forbidden" by |
|
|
1010 | // the new p5p powers, we need to call out to a perl function :/ |
|
|
1011 | if (ecb_expect_false (SvAMAGIC (k))) |
|
|
1012 | { |
|
|
1013 | dSP; |
|
|
1014 | |
|
|
1015 | ENTER; SAVETMPS; |
|
|
1016 | PUSHMARK (SP); |
|
|
1017 | EXTEND (SP, 3); |
|
|
1018 | PUSHs (sv_2mortal (newRV_inc ((SV *)hv))); |
|
|
1019 | PUSHs (sv_2mortal (k)); |
|
|
1020 | PUSHs (sv_2mortal (v)); |
|
|
1021 | |
|
|
1022 | PUTBACK; |
|
|
1023 | call_pv ("CBOR::XS::_hv_store", G_VOID | G_DISCARD | G_EVAL); |
|
|
1024 | SPAGAIN; |
|
|
1025 | |
|
|
1026 | FREETMPS; LEAVE; |
|
|
1027 | |
|
|
1028 | if (SvTRUE (ERRSV)) |
|
|
1029 | ERR_ERRSV; |
|
|
1030 | |
|
|
1031 | return; |
|
|
1032 | } |
|
|
1033 | |
779 | hv_store_ent (hv, k, v, 0); |
1034 | hv_store_ent (hv, k, v, 0); |
780 | SvREFCNT_dec (k); |
1035 | SvREFCNT_dec_NN (k); |
781 | |
1036 | |
782 | fail: |
1037 | fail: |
783 | ; |
1038 | ; |
784 | } |
1039 | } |
785 | |
1040 | |
… | |
… | |
796 | |
1051 | |
797 | for (;;) |
1052 | for (;;) |
798 | { |
1053 | { |
799 | WANT (1); |
1054 | WANT (1); |
800 | |
1055 | |
801 | if (*dec->cur == (MAJOR_MISC | MINOR_INDEF)) |
1056 | if (*dec->cur == (MAJOR_MISC | MINOR_INDEF) || dec->err) |
802 | { |
1057 | { |
803 | ++dec->cur; |
1058 | ++dec->cur; |
804 | break; |
1059 | break; |
805 | } |
1060 | } |
806 | |
1061 | |
807 | decode_he (dec, hv); |
1062 | decode_he (dec, hv); |
808 | } |
1063 | } |
809 | } |
1064 | } |
810 | else |
1065 | else |
811 | { |
1066 | { |
812 | int pairs = decode_uint (dec); |
1067 | UV pairs = decode_uint (dec); |
|
|
1068 | |
|
|
1069 | WANT (pairs); // complexity check - need at least one byte per value, do not allow supersize hashes |
813 | |
1070 | |
814 | while (pairs--) |
1071 | while (pairs--) |
815 | decode_he (dec, hv); |
1072 | decode_he (dec, hv); |
816 | } |
1073 | } |
817 | |
1074 | |
818 | DEC_DEC_DEPTH; |
1075 | DEC_DEC_DEPTH; |
819 | return newRV_noinc ((SV *)hv); |
1076 | return newRV_noinc ((SV *)hv); |
820 | |
1077 | |
821 | fail: |
1078 | fail: |
822 | SvREFCNT_dec (hv); |
1079 | SvREFCNT_dec_NN (hv); |
823 | DEC_DEC_DEPTH; |
1080 | DEC_DEC_DEPTH; |
824 | return &PL_sv_undef; |
1081 | return &PL_sv_undef; |
825 | } |
1082 | } |
826 | |
1083 | |
827 | static SV * |
1084 | static SV * |
828 | decode_str (dec_t *dec, int utf8) |
1085 | decode_str (dec_t *dec, int utf8) |
829 | { |
1086 | { |
830 | SV *sv = 0; |
1087 | SV *sv = 0; |
831 | |
1088 | |
832 | if ((*dec->cur & MINOR_MASK) == MINOR_INDEF) |
1089 | if (ecb_expect_false ((*dec->cur & MINOR_MASK) == MINOR_INDEF)) |
833 | { |
1090 | { |
834 | // indefinite length strings |
1091 | // indefinite length strings |
835 | ++dec->cur; |
1092 | ++dec->cur; |
836 | |
1093 | |
837 | U8 major = *dec->cur & MAJOR_MISC; |
1094 | U8 major = *dec->cur & MAJOR_MISC; |
… | |
… | |
872 | } |
1129 | } |
873 | |
1130 | |
874 | if (utf8) |
1131 | if (utf8) |
875 | { |
1132 | { |
876 | if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) |
1133 | if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) |
877 | if (!is_utf8_string (SvPVX (sv), SvCUR (sv))) |
1134 | if (!cbor_is_utf8_string (SvPVX (sv), SvCUR (sv))) |
878 | ERR ("corrupted CBOR data (invalid UTF-8 in text string)"); |
1135 | ERR ("corrupted CBOR data (invalid UTF-8 in text string)"); |
879 | |
1136 | |
880 | SvUTF8_on (sv); |
1137 | SvUTF8_on (sv); |
881 | } |
1138 | } |
882 | |
1139 | |
… | |
… | |
905 | sv = newRV_noinc (decode_sv (dec)); |
1162 | sv = newRV_noinc (decode_sv (dec)); |
906 | break; |
1163 | break; |
907 | |
1164 | |
908 | case CBOR_TAG_STRINGREF_NAMESPACE: |
1165 | case CBOR_TAG_STRINGREF_NAMESPACE: |
909 | { |
1166 | { |
|
|
1167 | // do not use SAVETMPS/FREETMPS, as these will |
|
|
1168 | // erase mortalised caches, e.g. "shareable" |
910 | ENTER; SAVETMPS; |
1169 | ENTER; |
911 | |
1170 | |
912 | SAVESPTR (dec->stringref); |
1171 | SAVESPTR (dec->stringref); |
913 | dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); |
1172 | dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); |
914 | |
1173 | |
915 | sv = decode_sv (dec); |
1174 | sv = decode_sv (dec); |
916 | |
1175 | |
917 | FREETMPS; LEAVE; |
1176 | LEAVE; |
918 | } |
1177 | } |
919 | break; |
1178 | break; |
920 | |
1179 | |
921 | case CBOR_TAG_STRINGREF: |
1180 | case CBOR_TAG_STRINGREF: |
922 | { |
1181 | { |
923 | if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) |
1182 | if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) |
924 | ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); |
1183 | ERR ("corrupted CBOR data (stringref index not an unsigned integer)"); |
925 | |
1184 | |
926 | UV idx = decode_uint (dec); |
1185 | UV idx = decode_uint (dec); |
927 | |
1186 | |
928 | if (!dec->stringref || (int)idx > AvFILLp (dec->stringref)) |
1187 | if (!dec->stringref || idx >= (UV)(1 + AvFILLp (dec->stringref))) |
929 | ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); |
1188 | ERR ("corrupted CBOR data (stringref index out of bounds or outside namespace)"); |
930 | |
1189 | |
931 | sv = newSVsv (AvARRAY (dec->stringref)[idx]); |
1190 | sv = newSVsv (AvARRAY (dec->stringref)[idx]); |
932 | } |
1191 | } |
933 | break; |
1192 | break; |
… | |
… | |
961 | if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) |
1220 | if ((*dec->cur >> MAJOR_SHIFT) != (MAJOR_POS_INT >> MAJOR_SHIFT)) |
962 | ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); |
1221 | ERR ("corrupted CBOR data (sharedref index not an unsigned integer)"); |
963 | |
1222 | |
964 | UV idx = decode_uint (dec); |
1223 | UV idx = decode_uint (dec); |
965 | |
1224 | |
966 | if (!dec->shareable || (int)idx > AvFILLp (dec->shareable)) |
1225 | if (!dec->shareable || idx >= (UV)(1 + AvFILLp (dec->shareable))) |
967 | ERR ("corrupted CBOR data (sharedref index out of bounds)"); |
1226 | ERR ("corrupted CBOR data (sharedref index out of bounds)"); |
968 | |
1227 | |
969 | sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); |
1228 | sv = SvREFCNT_inc_NN (AvARRAY (dec->shareable)[idx]); |
970 | |
1229 | |
971 | if (sv == &PL_sv_undef) |
1230 | if (sv == &PL_sv_undef) |
… | |
… | |
973 | } |
1232 | } |
974 | break; |
1233 | break; |
975 | |
1234 | |
976 | case CBOR_TAG_PERL_OBJECT: |
1235 | case CBOR_TAG_PERL_OBJECT: |
977 | { |
1236 | { |
|
|
1237 | if (dec->cbor.flags & F_FORBID_OBJECTS) |
|
|
1238 | goto filter; |
|
|
1239 | |
978 | sv = decode_sv (dec); |
1240 | sv = decode_sv (dec); |
979 | |
1241 | |
980 | if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) |
1242 | if (!SvROK (sv) || SvTYPE (SvRV (sv)) != SVt_PVAV) |
981 | ERR ("corrupted CBOR data (non-array perl object)"); |
1243 | ERR ("corrupted CBOR data (non-array perl object)"); |
982 | |
1244 | |
… | |
… | |
992 | if (!method) |
1254 | if (!method) |
993 | ERR ("cannot decode perl-object (package does not have a THAW method)"); |
1255 | ERR ("cannot decode perl-object (package does not have a THAW method)"); |
994 | |
1256 | |
995 | dSP; |
1257 | dSP; |
996 | |
1258 | |
997 | ENTER; SAVETMPS; PUSHMARK (SP); |
1259 | ENTER; SAVETMPS; |
|
|
1260 | PUSHMARK (SP); |
998 | EXTEND (SP, len + 1); |
1261 | EXTEND (SP, len + 1); |
999 | // we re-bless the reference to get overload and other niceties right |
1262 | // we re-bless the reference to get overload and other niceties right |
1000 | PUSHs (*av_fetch (av, 0, 1)); |
1263 | PUSHs (*av_fetch (av, 0, 1)); |
1001 | PUSHs (sv_cbor); |
1264 | PUSHs (sv_cbor); |
1002 | |
1265 | |
… | |
… | |
1010 | SPAGAIN; |
1273 | SPAGAIN; |
1011 | |
1274 | |
1012 | if (SvTRUE (ERRSV)) |
1275 | if (SvTRUE (ERRSV)) |
1013 | { |
1276 | { |
1014 | FREETMPS; LEAVE; |
1277 | FREETMPS; LEAVE; |
1015 | ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); |
1278 | ERR_ERRSV; |
1016 | } |
1279 | } |
1017 | |
1280 | |
1018 | SvREFCNT_dec (sv); |
1281 | SvREFCNT_dec_NN (sv); |
1019 | sv = SvREFCNT_inc (POPs); |
1282 | sv = SvREFCNT_inc (POPs); |
1020 | |
1283 | |
1021 | PUTBACK; |
1284 | PUTBACK; |
1022 | |
1285 | |
1023 | FREETMPS; LEAVE; |
1286 | FREETMPS; LEAVE; |
1024 | } |
1287 | } |
1025 | break; |
1288 | break; |
1026 | |
1289 | |
1027 | default: |
1290 | default: |
|
|
1291 | filter: |
1028 | { |
1292 | { |
|
|
1293 | SV *tag_sv = newSVuv (tag); |
|
|
1294 | |
1029 | sv = decode_sv (dec); |
1295 | sv = decode_sv (dec); |
1030 | |
1296 | |
1031 | dSP; |
1297 | dSP; |
1032 | ENTER; SAVETMPS; PUSHMARK (SP); |
1298 | ENTER; SAVETMPS; |
|
|
1299 | PUSHMARK (SP); |
1033 | EXTEND (SP, 2); |
1300 | EXTEND (SP, 2); |
1034 | PUSHs (newSVuv (tag)); |
1301 | PUSHs (tag_sv); |
1035 | PUSHs (sv); |
1302 | PUSHs (sv); |
1036 | |
1303 | |
1037 | PUTBACK; |
1304 | PUTBACK; |
1038 | int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); |
1305 | int count = call_sv (dec->cbor.filter ? dec->cbor.filter : default_filter, G_ARRAY | G_EVAL); |
1039 | SPAGAIN; |
1306 | SPAGAIN; |
1040 | |
1307 | |
1041 | if (SvTRUE (ERRSV)) |
1308 | if (SvTRUE (ERRSV)) |
1042 | { |
1309 | { |
|
|
1310 | SvREFCNT_dec_NN (tag_sv); |
1043 | FREETMPS; LEAVE; |
1311 | FREETMPS; LEAVE; |
1044 | ERR (SvPVutf8_nolen (sv_2mortal (SvREFCNT_inc (ERRSV)))); |
1312 | ERR_ERRSV; |
1045 | } |
1313 | } |
1046 | |
1314 | |
1047 | if (count) |
1315 | if (count) |
1048 | { |
1316 | { |
|
|
1317 | SvREFCNT_dec_NN (tag_sv); |
1049 | SvREFCNT_dec (sv); |
1318 | SvREFCNT_dec_NN (sv); |
1050 | sv = SvREFCNT_inc (POPs); |
1319 | sv = SvREFCNT_inc_NN (TOPs); |
|
|
1320 | SP -= count; |
1051 | } |
1321 | } |
1052 | else |
1322 | else |
1053 | { |
1323 | { |
1054 | AV *av = newAV (); |
1324 | AV *av = newAV (); |
1055 | av_push (av, newSVuv (tag)); |
1325 | av_push (av, tag_sv); |
1056 | av_push (av, sv); |
1326 | av_push (av, sv); |
1057 | |
1327 | |
1058 | HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash |
1328 | HV *tagged_stash = !CBOR_SLOW || cbor_tagged_stash |
1059 | ? cbor_tagged_stash |
1329 | ? cbor_tagged_stash |
1060 | : gv_stashpv ("CBOR::XS::Tagged" , 1); |
1330 | : gv_stashpv ("CBOR::XS::Tagged" , 1); |
… | |
… | |
1189 | |
1459 | |
1190 | if (dec.err) |
1460 | if (dec.err) |
1191 | { |
1461 | { |
1192 | if (dec.shareable) |
1462 | if (dec.shareable) |
1193 | { |
1463 | { |
1194 | // need to break cyclic links, which whould all be in shareable |
1464 | // need to break cyclic links, which would all be in shareable |
1195 | int i; |
1465 | int i; |
1196 | SV **svp; |
1466 | SV **svp; |
1197 | |
1467 | |
1198 | for (i = av_len (dec.shareable) + 1; i--; ) |
1468 | for (i = av_len (dec.shareable) + 1; i--; ) |
1199 | if ((svp = av_fetch (dec.shareable, i, 0))) |
1469 | if ((svp = av_fetch (dec.shareable, i, 0))) |
1200 | sv_setsv (*svp, &PL_sv_undef); |
1470 | sv_setsv (*svp, &PL_sv_undef); |
1201 | } |
1471 | } |
1202 | |
1472 | |
1203 | SvREFCNT_dec (sv); |
1473 | SvREFCNT_dec_NN (sv); |
|
|
1474 | |
|
|
1475 | if (dec.err_sv) |
|
|
1476 | sv_2mortal (dec.err_sv); |
|
|
1477 | |
1204 | croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); |
1478 | croak ("%s, at offset %ld (octet 0x%02x)", dec.err, (long)(dec.cur - (U8 *)data), (int)(uint8_t)*dec.cur); |
1205 | } |
1479 | } |
1206 | |
1480 | |
1207 | sv = sv_2mortal (sv); |
1481 | sv = sv_2mortal (sv); |
1208 | |
1482 | |
1209 | return sv; |
1483 | return sv; |
… | |
… | |
1298 | |
1572 | |
1299 | break; |
1573 | break; |
1300 | |
1574 | |
1301 | case MAJOR_MAP >> MAJOR_SHIFT: |
1575 | case MAJOR_MAP >> MAJOR_SHIFT: |
1302 | len <<= 1; |
1576 | len <<= 1; |
|
|
1577 | /* FALLTHROUGH */ |
1303 | case MAJOR_ARRAY >> MAJOR_SHIFT: |
1578 | case MAJOR_ARRAY >> MAJOR_SHIFT: |
1304 | if (len) |
1579 | if (len) |
1305 | { |
1580 | { |
1306 | av_push (self->incr_count, newSViv (len + 1)); //TODO: nest |
1581 | av_push (self->incr_count, newSViv (len + 1)); //TODO: nest |
1307 | count = len + 1; |
1582 | count = len + 1; |
… | |
… | |
1352 | |
1627 | |
1353 | default_filter = newSVpv ("CBOR::XS::default_filter", 0); |
1628 | default_filter = newSVpv ("CBOR::XS::default_filter", 0); |
1354 | |
1629 | |
1355 | sv_cbor = newSVpv ("CBOR", 0); |
1630 | sv_cbor = newSVpv ("CBOR", 0); |
1356 | SvREADONLY_on (sv_cbor); |
1631 | SvREADONLY_on (sv_cbor); |
|
|
1632 | |
|
|
1633 | assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1)); |
1357 | } |
1634 | } |
1358 | |
1635 | |
1359 | PROTOTYPES: DISABLE |
1636 | PROTOTYPES: DISABLE |
1360 | |
1637 | |
1361 | void CLONE (...) |
1638 | void CLONE (...) |
… | |
… | |
1381 | ALIAS: |
1658 | ALIAS: |
1382 | shrink = F_SHRINK |
1659 | shrink = F_SHRINK |
1383 | allow_unknown = F_ALLOW_UNKNOWN |
1660 | allow_unknown = F_ALLOW_UNKNOWN |
1384 | allow_sharing = F_ALLOW_SHARING |
1661 | allow_sharing = F_ALLOW_SHARING |
1385 | allow_cycles = F_ALLOW_CYCLES |
1662 | allow_cycles = F_ALLOW_CYCLES |
|
|
1663 | forbid_objects = F_FORBID_OBJECTS |
1386 | pack_strings = F_PACK_STRINGS |
1664 | pack_strings = F_PACK_STRINGS |
|
|
1665 | text_keys = F_TEXT_KEYS |
|
|
1666 | text_strings = F_TEXT_STRINGS |
1387 | validate_utf8 = F_VALIDATE_UTF8 |
1667 | validate_utf8 = F_VALIDATE_UTF8 |
1388 | PPCODE: |
1668 | PPCODE: |
1389 | { |
1669 | { |
1390 | if (enable) |
1670 | if (enable) |
1391 | self->flags |= ix; |
1671 | self->flags |= ix; |
… | |
… | |
1399 | ALIAS: |
1679 | ALIAS: |
1400 | get_shrink = F_SHRINK |
1680 | get_shrink = F_SHRINK |
1401 | get_allow_unknown = F_ALLOW_UNKNOWN |
1681 | get_allow_unknown = F_ALLOW_UNKNOWN |
1402 | get_allow_sharing = F_ALLOW_SHARING |
1682 | get_allow_sharing = F_ALLOW_SHARING |
1403 | get_allow_cycles = F_ALLOW_CYCLES |
1683 | get_allow_cycles = F_ALLOW_CYCLES |
|
|
1684 | get_forbid_objects = F_FORBID_OBJECTS |
1404 | get_pack_strings = F_PACK_STRINGS |
1685 | get_pack_strings = F_PACK_STRINGS |
|
|
1686 | get_text_keys = F_TEXT_KEYS |
|
|
1687 | get_text_strings = F_TEXT_STRINGS |
1405 | get_validate_utf8 = F_VALIDATE_UTF8 |
1688 | get_validate_utf8 = F_VALIDATE_UTF8 |
1406 | PPCODE: |
1689 | PPCODE: |
1407 | XPUSHs (boolSV (self->flags & ix)); |
1690 | XPUSHs (boolSV (self->flags & ix)); |
1408 | |
1691 | |
1409 | void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) |
1692 | void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) |
… | |
… | |
1539 | cbor_init (&cbor); |
1822 | cbor_init (&cbor); |
1540 | PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; |
1823 | PUTBACK; cborstr = decode_cbor (cborstr, &cbor, 0); SPAGAIN; |
1541 | XPUSHs (cborstr); |
1824 | XPUSHs (cborstr); |
1542 | } |
1825 | } |
1543 | |
1826 | |
|
|
1827 | #ifdef __AFL_COMPILER |
|
|
1828 | |
|
|
1829 | void |
|
|
1830 | afl_init () |
|
|
1831 | CODE: |
|
|
1832 | __AFL_INIT (); |
|
|
1833 | |
|
|
1834 | int |
|
|
1835 | afl_loop (unsigned int count = 10000) |
|
|
1836 | CODE: |
|
|
1837 | RETVAL = __AFL_LOOP (count); |
|
|
1838 | OUTPUT: |
|
|
1839 | RETVAL |
|
|
1840 | |
|
|
1841 | #endif |
|
|
1842 | |