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.46 by root, Sun Dec 14 05:57:22 2014 UTC vs.
Revision 1.51 by root, Sun Apr 24 13:15:19 2016 UTC

… …
100#define F_SHRINK 0x00000001UL 100#define F_SHRINK 0x00000001UL
101#define F_ALLOW_UNKNOWN 0x00000002UL 101#define F_ALLOW_UNKNOWN 0x00000002UL
102#define F_ALLOW_SHARING 0x00000004UL 102#define F_ALLOW_SHARING 0x00000004UL
103#define F_ALLOW_CYCLES 0x00000008UL 103#define F_ALLOW_CYCLES 0x00000008UL
104#define F_PACK_STRINGS 0x00000010UL 104#define F_PACK_STRINGS 0x00000010UL
105#define F_UTF8_STRINGS 0x00000020UL
105#define F_VALIDATE_UTF8 0x00000020UL 106#define F_VALIDATE_UTF8 0x00000040UL
106 107
107#define INIT_SIZE 32 // initial scalar size to be allocated 108#define INIT_SIZE 32 // initial scalar size to be allocated
108 109
109#define SB do { 110#define SB do {
110#define SE } while (0) 111#define SE } while (0)
… …
279} 280}
280 281
281ecb_inline void 282ecb_inline void
282encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 283encode_str (enc_t *enc, int utf8, char *str, STRLEN len)
283{ 284{
285 if (ecb_expect_false (enc->cbor.flags & F_UTF8_STRINGS))
286 if (!utf8)
287 {
288 SV *sv = sv_newmortal ();
289 char *s; STRLEN l;
290
291 sv_setpvn (sv, str, len);
292
293 s = SvPVutf8 (sv, l);
294 encode_str (enc, 1, s, l);
295 return;
296 }
297
284 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 298 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
285 need (enc, len); 299 need (enc, len);
286 memcpy (enc->cur, str, len); 300 memcpy (enc->cur, str, len);
287 enc->cur += len; 301 enc->cur += len;
288} 302}
… …
449 463
450 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 464 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
451 { 465 {
452 dSP; 466 dSP;
453 467
454 ENTER; SAVETMPS; PUSHMARK (SP); 468 ENTER; SAVETMPS;
469 PUSHMARK (SP);
455 // we re-bless the reference to get overload and other niceties right 470 // we re-bless the reference to get overload and other niceties right
456 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 471 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
457 472
458 PUTBACK; 473 PUTBACK;
459 // G_SCALAR ensures that return value is 1 474 // G_SCALAR ensures that return value is 1
… …
472 } 487 }
473 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 488 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
474 { 489 {
475 dSP; 490 dSP;
476 491
477 ENTER; SAVETMPS; PUSHMARK (SP); 492 ENTER; SAVETMPS;
493 SAVESTACK_POS ();
494 PUSHMARK (SP);
478 EXTEND (SP, 2); 495 EXTEND (SP, 2);
479 // we re-bless the reference to get overload and other niceties right 496 // we re-bless the reference to get overload and other niceties right
480 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 497 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
481 PUSHs (sv_cbor); 498 PUSHs (sv_cbor);
482 499
… …
584} 601}
585 602
586static SV * 603static SV *
587encode_cbor (SV *scalar, CBOR *cbor) 604encode_cbor (SV *scalar, CBOR *cbor)
588{ 605{
589 enc_t enc = { }; 606 enc_t enc = { 0 };
590 607
591 enc.cbor = *cbor; 608 enc.cbor = *cbor;
592 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 609 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
593 enc.cur = SvPVX (enc.sv); 610 enc.cur = SvPVX (enc.sv);
594 enc.end = SvEND (enc.sv); 611 enc.end = SvEND (enc.sv);
… …
749 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 766 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
750 { 767 {
751 I32 len = decode_uint (dec); 768 I32 len = decode_uint (dec);
752 char *key = (char *)dec->cur; 769 char *key = (char *)dec->cur;
753 770
771 WANT (len);
754 dec->cur += len; 772 dec->cur += len;
755 773
756 hv_store (hv, key, len, decode_sv (dec), 0); 774 hv_store (hv, key, len, decode_sv (dec), 0);
757 775
758 return; 776 return;
759 } 777 }
760 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 778 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
761 { 779 {
762 I32 len = decode_uint (dec); 780 I32 len = decode_uint (dec);
763 char *key = (char *)dec->cur; 781 char *key = (char *)dec->cur;
764 782
783 WANT (len);
765 dec->cur += len; 784 dec->cur += len;
766 785
767 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8)) 786 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
768 if (!is_utf8_string (key, len)) 787 if (!is_utf8_string (key, len))
769 ERR ("corrupted CBOR data (invalid UTF-8 in map key)"); 788 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
… …
992 if (!method) 1011 if (!method)
993 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1012 ERR ("cannot decode perl-object (package does not have a THAW method)");
994 1013
995 dSP; 1014 dSP;
996 1015
997 ENTER; SAVETMPS; PUSHMARK (SP); 1016 ENTER; SAVETMPS;
1017 PUSHMARK (SP);
998 EXTEND (SP, len + 1); 1018 EXTEND (SP, len + 1);
999 // we re-bless the reference to get overload and other niceties right 1019 // we re-bless the reference to get overload and other niceties right
1000 PUSHs (*av_fetch (av, 0, 1)); 1020 PUSHs (*av_fetch (av, 0, 1));
1001 PUSHs (sv_cbor); 1021 PUSHs (sv_cbor);
1002 1022
… …
1027 default: 1047 default:
1028 { 1048 {
1029 sv = decode_sv (dec); 1049 sv = decode_sv (dec);
1030 1050
1031 dSP; 1051 dSP;
1032 ENTER; SAVETMPS; PUSHMARK (SP); 1052 ENTER; SAVETMPS;
1053 SAVESTACK_POS ();
1054 PUSHMARK (SP);
1033 EXTEND (SP, 2); 1055 EXTEND (SP, 2);
1034 PUSHs (newSVuv (tag)); 1056 PUSHs (newSVuv (tag));
1035 PUSHs (sv); 1057 PUSHs (sv);
1036 1058
1037 PUTBACK; 1059 PUTBACK;
… …
1163} 1185}
1164 1186
1165static SV * 1187static SV *
1166decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1188decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1167{ 1189{
1168 dec_t dec = { }; 1190 dec_t dec = { 0 };
1169 SV *sv; 1191 SV *sv;
1170 STRLEN len; 1192 STRLEN len;
1171 char *data = SvPVbyte (string, len); 1193 char *data = SvPVbyte (string, len);
1172 1194
1173 if (len > cbor->max_size && cbor->max_size) 1195 if (len > cbor->max_size && cbor->max_size)
… …
1264 1286
1265 int major = *p >> MAJOR_SHIFT; 1287 int major = *p >> MAJOR_SHIFT;
1266 1288
1267 switch (major) 1289 switch (major)
1268 { 1290 {
1291 case MAJOR_TAG >> MAJOR_SHIFT:
1292 ++count; // tags merely prefix another value
1293 break;
1294
1269 case MAJOR_BYTES >> MAJOR_SHIFT: 1295 case MAJOR_BYTES >> MAJOR_SHIFT:
1270 case MAJOR_TEXT >> MAJOR_SHIFT: 1296 case MAJOR_TEXT >> MAJOR_SHIFT:
1271 case MAJOR_ARRAY >> MAJOR_SHIFT: 1297 case MAJOR_ARRAY >> MAJOR_SHIFT:
1272 case MAJOR_MAP >> MAJOR_SHIFT: 1298 case MAJOR_MAP >> MAJOR_SHIFT:
1273 { 1299 {
… …
1378 shrink = F_SHRINK 1404 shrink = F_SHRINK
1379 allow_unknown = F_ALLOW_UNKNOWN 1405 allow_unknown = F_ALLOW_UNKNOWN
1380 allow_sharing = F_ALLOW_SHARING 1406 allow_sharing = F_ALLOW_SHARING
1381 allow_cycles = F_ALLOW_CYCLES 1407 allow_cycles = F_ALLOW_CYCLES
1382 pack_strings = F_PACK_STRINGS 1408 pack_strings = F_PACK_STRINGS
1409 utf8_strings = F_UTF8_STRINGS
1383 validate_utf8 = F_VALIDATE_UTF8 1410 validate_utf8 = F_VALIDATE_UTF8
1384 PPCODE: 1411 PPCODE:
1385{ 1412{
1386 if (enable) 1413 if (enable)
1387 self->flags |= ix; 1414 self->flags |= ix;

Diff Legend

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