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.37 by root, Sat Nov 30 18:13:53 2013 UTC vs.
Revision 1.56 by root, Fri Nov 25 11:33:03 2016 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))
… …
99#define F_SHRINK 0x00000001UL 100#define F_SHRINK 0x00000001UL
100#define F_ALLOW_UNKNOWN 0x00000002UL 101#define F_ALLOW_UNKNOWN 0x00000002UL
101#define F_ALLOW_SHARING 0x00000004UL 102#define F_ALLOW_SHARING 0x00000004UL
102#define F_ALLOW_CYCLES 0x00000008UL 103#define F_ALLOW_CYCLES 0x00000008UL
103#define F_PACK_STRINGS 0x00000010UL 104#define F_PACK_STRINGS 0x00000010UL
105#define F_TEXT_KEYS 0x00000020UL
106#define F_TEXT_STRINGS 0x00000040UL
107#define F_VALIDATE_UTF8 0x00000080UL
104 108
105#define INIT_SIZE 32 // initial scalar size to be allocated 109#define INIT_SIZE 32 // initial scalar size to be allocated
106 110
107#define SB do { 111#define SB do {
108#define SE } while (0) 112#define SE } while (0)
… …
127typedef struct { 131typedef struct {
128 U32 flags; 132 U32 flags;
129 U32 max_depth; 133 U32 max_depth;
130 STRLEN max_size; 134 STRLEN max_size;
131 SV *filter; 135 SV *filter;
136
137 // for the incremental parser
138 STRLEN incr_pos; // the current offset into the text
139 STRLEN incr_need; // minimum bytes needed to decode
140 AV *incr_count; // for every nesting level, the number of outstanding values, or -1 for indef.
132} CBOR; 141} CBOR;
133 142
134ecb_inline void 143ecb_inline void
135cbor_init (CBOR *cbor) 144cbor_init (CBOR *cbor)
136{ 145{
… …
140 149
141ecb_inline void 150ecb_inline void
142cbor_free (CBOR *cbor) 151cbor_free (CBOR *cbor)
143{ 152{
144 SvREFCNT_dec (cbor->filter); 153 SvREFCNT_dec (cbor->filter);
154 SvREFCNT_dec (cbor->incr_count);
145} 155}
146 156
147///////////////////////////////////////////////////////////////////////////// 157/////////////////////////////////////////////////////////////////////////////
148// utility functions 158// utility functions
149 159
… …
268encode_tag (enc_t *enc, UV tag) 278encode_tag (enc_t *enc, UV tag)
269{ 279{
270 encode_uint (enc, MAJOR_TAG, tag); 280 encode_uint (enc, MAJOR_TAG, tag);
271} 281}
272 282
283// exceptional (hopefully) slow path for byte strings that need to be utf8-encoded
284ecb_noinline static void
285encode_str_utf8 (enc_t *enc, int utf8, char *str, STRLEN len)
286{
287 STRLEN ulen = len;
288 U8 *p, *pend = (U8 *)str + len;
289
290 for (p = (U8 *)str; p < pend; ++p)
291 ulen += *p >> 7; // count set high bits
292
293 encode_uint (enc, MAJOR_TEXT, ulen);
294
295 need (enc, ulen);
296 for (p = (U8 *)str; p < pend; ++p)
297 if (*p < 0x80)
298 *enc->cur++ = *p;
299 else
300 {
301 *enc->cur++ = 0xc0 + (*p >> 6);
302 *enc->cur++ = 0x80 + (*p & 63);
303 }
304}
305
273ecb_inline void 306ecb_inline void
274encode_str (enc_t *enc, int utf8, char *str, STRLEN len) 307encode_str (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
275{ 308{
309 if (ecb_expect_false (upgrade_utf8))
310 if (!utf8)
311 {
312 encode_str_utf8 (enc, utf8, str, len);
313 return;
314 }
315
276 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len); 316 encode_uint (enc, utf8 ? MAJOR_TEXT : MAJOR_BYTES, len);
277 need (enc, len); 317 need (enc, len);
278 memcpy (enc->cur, str, len); 318 memcpy (enc->cur, str, len);
279 enc->cur += len; 319 enc->cur += len;
280} 320}
281 321
282static void 322ecb_inline void
283encode_strref (enc_t *enc, int utf8, char *str, STRLEN len) 323encode_strref (enc_t *enc, int upgrade_utf8, int utf8, char *str, STRLEN len)
284{ 324{
285 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS)) 325 if (ecb_expect_false (enc->cbor.flags & F_PACK_STRINGS))
286 { 326 {
287 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1); 327 SV **svp = hv_fetch (enc->stringref[!!utf8], str, len, 1);
288 328
… …
299 sv_setuv (*svp, enc->stringref_idx); 339 sv_setuv (*svp, enc->stringref_idx);
300 ++enc->stringref_idx; 340 ++enc->stringref_idx;
301 } 341 }
302 } 342 }
303 343
304 encode_str (enc, utf8, str, len); 344 encode_str (enc, upgrade_utf8, utf8, str, len);
305} 345}
306 346
307static void encode_sv (enc_t *enc, SV *sv); 347static void encode_sv (enc_t *enc, SV *sv);
308 348
309static void 349static void
… …
316 356
317 ++enc->depth; 357 ++enc->depth;
318 358
319 encode_uint (enc, MAJOR_ARRAY, len + 1); 359 encode_uint (enc, MAJOR_ARRAY, len + 1);
320 360
361 if (SvMAGICAL (av))
321 for (i = 0; i <= len; ++i) 362 for (i = 0; i <= len; ++i)
322 { 363 {
323 SV **svp = av_fetch (av, i, 0); 364 SV **svp = av_fetch (av, i, 0);
324 encode_sv (enc, svp ? *svp : &PL_sv_undef); 365 encode_sv (enc, svp ? *svp : &PL_sv_undef);
325 } 366 }
367 else
368 for (i = 0; i <= len; ++i)
369 {
370 SV *sv = AvARRAY (av)[i];
371 encode_sv (enc, sv ? sv : &PL_sv_undef);
372 }
326 373
327 --enc->depth; 374 --enc->depth;
328} 375}
329 376
330static void 377static void
… …
348 while ((he = hv_iternext (hv))) 395 while ((he = hv_iternext (hv)))
349 { 396 {
350 if (HeKLEN (he) == HEf_SVKEY) 397 if (HeKLEN (he) == HEf_SVKEY)
351 encode_sv (enc, HeSVKEY (he)); 398 encode_sv (enc, HeSVKEY (he));
352 else 399 else
353 encode_strref (enc, HeKUTF8 (he), HeKEY (he), HeKLEN (he)); 400 encode_strref (enc, enc->cbor.flags & (F_TEXT_KEYS | F_TEXT_STRINGS), HeKUTF8 (he), HeKEY (he), HeKLEN (he));
354 401
355 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he)); 402 encode_sv (enc, ecb_expect_false (mg) ? hv_iterval (hv, he) : HeVAL (he));
356 } 403 }
357 404
358 if (mg) 405 if (mg)
… …
434 481
435 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0))) 482 if ((method = gv_fetchmethod_autoload (stash, "TO_CBOR", 0)))
436 { 483 {
437 dSP; 484 dSP;
438 485
439 ENTER; SAVETMPS; PUSHMARK (SP); 486 ENTER; SAVETMPS;
487 PUSHMARK (SP);
440 // we re-bless the reference to get overload and other niceties right 488 // we re-bless the reference to get overload and other niceties right
441 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 489 XPUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
442 490
443 PUTBACK; 491 PUTBACK;
444 // G_SCALAR ensures that return value is 1 492 // G_SCALAR ensures that return value is 1
… …
457 } 505 }
458 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0) 506 else if ((method = gv_fetchmethod_autoload (stash, "FREEZE", 0)) != 0)
459 { 507 {
460 dSP; 508 dSP;
461 509
462 ENTER; SAVETMPS; PUSHMARK (SP); 510 ENTER; SAVETMPS;
511 SAVESTACK_POS ();
512 PUSHMARK (SP);
463 EXTEND (SP, 2); 513 EXTEND (SP, 2);
464 // we re-bless the reference to get overload and other niceties right 514 // we re-bless the reference to get overload and other niceties right
465 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash)); 515 PUSHs (sv_bless (sv_2mortal (newRV_inc (sv)), stash));
466 PUSHs (sv_cbor); 516 PUSHs (sv_cbor);
467 517
… …
473 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv) 523 if (count == 1 && SvROK (TOPs) && SvRV (TOPs) == sv)
474 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash)); 524 croak ("%s::FREEZE(CBOR) method returned same object as was passed instead of a new one", HvNAME (stash));
475 525
476 encode_tag (enc, CBOR_TAG_PERL_OBJECT); 526 encode_tag (enc, CBOR_TAG_PERL_OBJECT);
477 encode_uint (enc, MAJOR_ARRAY, count + 1); 527 encode_uint (enc, MAJOR_ARRAY, count + 1);
478 encode_strref (enc, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash)); 528 encode_strref (enc, 0, HvNAMEUTF8 (stash), HvNAME (stash), HvNAMELEN (stash));
479 529
480 while (count) 530 while (count)
481 encode_sv (enc, SP[1 - count--]); 531 encode_sv (enc, SP[1 - count--]);
482 532
483 PUTBACK; 533 PUTBACK;
… …
542 592
543 if (SvPOKp (sv)) 593 if (SvPOKp (sv))
544 { 594 {
545 STRLEN len; 595 STRLEN len;
546 char *str = SvPV (sv, len); 596 char *str = SvPV (sv, len);
547 encode_strref (enc, SvUTF8 (sv), str, len); 597 encode_strref (enc, enc->cbor.flags & F_TEXT_STRINGS, SvUTF8 (sv), str, len);
548 } 598 }
549 else if (SvNOKp (sv)) 599 else if (SvNOKp (sv))
550 encode_nv (enc, sv); 600 encode_nv (enc, sv);
551 else if (SvIOKp (sv)) 601 else if (SvIOKp (sv))
552 { 602 {
… …
569} 619}
570 620
571static SV * 621static SV *
572encode_cbor (SV *scalar, CBOR *cbor) 622encode_cbor (SV *scalar, CBOR *cbor)
573{ 623{
574 enc_t enc = { }; 624 enc_t enc = { 0 };
575 625
576 enc.cbor = *cbor; 626 enc.cbor = *cbor;
577 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE)); 627 enc.sv = sv_2mortal (NEWSV (0, INIT_SIZE));
578 enc.cur = SvPVX (enc.sv); 628 enc.cur = SvPVX (enc.sv);
579 enc.end = SvEND (enc.sv); 629 enc.end = SvEND (enc.sv);
… …
617 667
618#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE 668#define ERR(reason) SB if (!dec->err) dec->err = reason; goto fail; SE
619 669
620#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data") 670#define WANT(len) if (ecb_expect_false (dec->cur + len > dec->end)) ERR ("unexpected end of CBOR data")
621 671
622#define DEC_INC_DEPTH if (++dec->depth > dec->cbor.max_depth) ERR (ERR_NESTING_EXCEEDED) 672#define DEC_INC_DEPTH if (ecb_expect_false (++dec->depth > dec->cbor.max_depth)) ERR (ERR_NESTING_EXCEEDED)
623#define DEC_DEC_DEPTH --dec->depth 673#define DEC_DEC_DEPTH --dec->depth
624 674
625static UV 675static UV
626decode_uint (dec_t *dec) 676decode_uint (dec_t *dec)
627{ 677{
… …
729{ 779{
730 // for speed reasons, we specialcase single-string 780 // for speed reasons, we specialcase single-string
731 // byte or utf-8 strings as keys, but only when !stringref 781 // byte or utf-8 strings as keys, but only when !stringref
732 782
733 if (ecb_expect_true (!dec->stringref)) 783 if (ecb_expect_true (!dec->stringref))
734 if (ecb_expect_true ((*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8)) 784 if (ecb_expect_true ((U8)(*dec->cur - MAJOR_BYTES) <= LENGTH_EXT8))
735 { 785 {
736 I32 len = decode_uint (dec); 786 STRLEN len = decode_uint (dec);
737 char *key = (char *)dec->cur; 787 char *key = (char *)dec->cur;
738 788
789 WANT (len);
739 dec->cur += len; 790 dec->cur += len;
740 791
741 if (ecb_expect_false (dec->stringref))
742 av_push (dec->stringref, newSVpvn (key, len));
743
744 hv_store (hv, key, len, decode_sv (dec), 0); 792 hv_store (hv, key, len, decode_sv (dec), 0);
745 793
746 return; 794 return;
747 } 795 }
748 else if (ecb_expect_true ((*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8)) 796 else if (ecb_expect_true ((U8)(*dec->cur - MAJOR_TEXT) <= LENGTH_EXT8))
749 { 797 {
750 I32 len = decode_uint (dec); 798 STRLEN len = decode_uint (dec);
751 char *key = (char *)dec->cur; 799 char *key = (char *)dec->cur;
752 800
801 WANT (len);
753 dec->cur += len; 802 dec->cur += len;
754 803
755 if (ecb_expect_false (dec->stringref)) 804 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
756 av_push (dec->stringref, newSVpvn_utf8 (key, len, 1)); 805 if (!is_utf8_string (key, len))
806 ERR ("corrupted CBOR data (invalid UTF-8 in map key)");
757 807
758 hv_store (hv, key, -len, decode_sv (dec), 0); 808 hv_store (hv, key, -len, decode_sv (dec), 0);
759 809
760 return; 810 return;
761 } 811 }
… …
763 SV *k = decode_sv (dec); 813 SV *k = decode_sv (dec);
764 SV *v = decode_sv (dec); 814 SV *v = decode_sv (dec);
765 815
766 hv_store_ent (hv, k, v, 0); 816 hv_store_ent (hv, k, v, 0);
767 SvREFCNT_dec (k); 817 SvREFCNT_dec (k);
818
819fail:
820 ;
768} 821}
769 822
770static SV * 823static SV *
771decode_hv (dec_t *dec) 824decode_hv (dec_t *dec)
772{ 825{
… …
854 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1)) 907 && SvCUR (sv) >= minimum_string_length (AvFILLp (dec->stringref) + 1))
855 av_push (dec->stringref, SvREFCNT_inc_NN (sv)); 908 av_push (dec->stringref, SvREFCNT_inc_NN (sv));
856 } 909 }
857 910
858 if (utf8) 911 if (utf8)
912 {
913 if (ecb_expect_false (dec->cbor.flags & F_VALIDATE_UTF8))
914 if (!is_utf8_string (SvPVX (sv), SvCUR (sv)))
915 ERR ("corrupted CBOR data (invalid UTF-8 in text string)");
916
859 SvUTF8_on (sv); 917 SvUTF8_on (sv);
918 }
860 919
861 return sv; 920 return sv;
862 921
863fail: 922fail:
864 SvREFCNT_dec (sv); 923 SvREFCNT_dec (sv);
… …
883 sv = newRV_noinc (decode_sv (dec)); 942 sv = newRV_noinc (decode_sv (dec));
884 break; 943 break;
885 944
886 case CBOR_TAG_STRINGREF_NAMESPACE: 945 case CBOR_TAG_STRINGREF_NAMESPACE:
887 { 946 {
947 // do nmot use SAVETMPS/FREETMPS, as these will
948 // erase mortalised caches, e.g. "shareable"
888 ENTER; SAVETMPS; 949 ENTER;
889 950
890 SAVESPTR (dec->stringref); 951 SAVESPTR (dec->stringref);
891 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ()); 952 dec->stringref = (AV *)sv_2mortal ((SV *)newAV ());
892 953
893 sv = decode_sv (dec); 954 sv = decode_sv (dec);
894 955
895 FREETMPS; LEAVE; 956 LEAVE;
896 } 957 }
897 break; 958 break;
898 959
899 case CBOR_TAG_STRINGREF: 960 case CBOR_TAG_STRINGREF:
900 { 961 {
… …
970 if (!method) 1031 if (!method)
971 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1032 ERR ("cannot decode perl-object (package does not have a THAW method)");
972 1033
973 dSP; 1034 dSP;
974 1035
975 ENTER; SAVETMPS; PUSHMARK (SP); 1036 ENTER; SAVETMPS;
1037 PUSHMARK (SP);
976 EXTEND (SP, len + 1); 1038 EXTEND (SP, len + 1);
977 // we re-bless the reference to get overload and other niceties right 1039 // we re-bless the reference to get overload and other niceties right
978 PUSHs (*av_fetch (av, 0, 1)); 1040 PUSHs (*av_fetch (av, 0, 1));
979 PUSHs (sv_cbor); 1041 PUSHs (sv_cbor);
980 1042
… …
1005 default: 1067 default:
1006 { 1068 {
1007 sv = decode_sv (dec); 1069 sv = decode_sv (dec);
1008 1070
1009 dSP; 1071 dSP;
1010 ENTER; SAVETMPS; PUSHMARK (SP); 1072 ENTER; SAVETMPS;
1073 SAVESTACK_POS ();
1074 PUSHMARK (SP);
1011 EXTEND (SP, 2); 1075 EXTEND (SP, 2);
1012 PUSHs (newSVuv (tag)); 1076 PUSHs (newSVuv (tag));
1013 PUSHs (sv); 1077 PUSHs (sv);
1014 1078
1015 PUTBACK; 1079 PUTBACK;
… …
1124 1188
1125 return newSVnv (ecb_binary64_to_double (fp)); 1189 return newSVnv (ecb_binary64_to_double (fp));
1126 } 1190 }
1127 1191
1128 // 0..19 unassigned simple 1192 // 0..19 unassigned simple
1129 // 24 reserved + unassigned (reserved values are not encodable) 1193 // 24 reserved + unassigned simple (reserved values are not encodable)
1194 // 28-30 unassigned misc
1195 // 31 break code
1130 default: 1196 default:
1131 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1197 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1132 } 1198 }
1133 1199
1134 break; 1200 break;
1135 } 1201 }
1136 1202
… …
1139} 1205}
1140 1206
1141static SV * 1207static SV *
1142decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1208decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1143{ 1209{
1144 dec_t dec = { }; 1210 dec_t dec = { 0 };
1145 SV *sv; 1211 SV *sv;
1146 STRLEN len; 1212 STRLEN len;
1147 char *data = SvPVbyte (string, len); 1213 char *data = SvPVbyte (string, len);
1148 1214
1149 if (len > cbor->max_size && cbor->max_size) 1215 if (len > cbor->max_size && cbor->max_size)
… …
1163 if (dec.cur != dec.end && !dec.err) 1229 if (dec.cur != dec.end && !dec.err)
1164 dec.err = "garbage after CBOR object"; 1230 dec.err = "garbage after CBOR object";
1165 1231
1166 if (dec.err) 1232 if (dec.err)
1167 { 1233 {
1234 if (dec.shareable)
1235 {
1236 // need to break cyclic links, which whould all be in shareable
1237 int i;
1238 SV **svp;
1239
1240 for (i = av_len (dec.shareable) + 1; i--; )
1241 if ((svp = av_fetch (dec.shareable, i, 0)))
1242 sv_setsv (*svp, &PL_sv_undef);
1243 }
1244
1168 SvREFCNT_dec (sv); 1245 SvREFCNT_dec (sv);
1169 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1246 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1170 } 1247 }
1171 1248
1172 sv = sv_2mortal (sv); 1249 sv = sv_2mortal (sv);
1173 1250
1174 return sv; 1251 return sv;
1175} 1252}
1176 1253
1254/////////////////////////////////////////////////////////////////////////////
1255// incremental parser
1256
1257#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
1258
1259// returns 0 for notyet, 1 for success or error
1260static int
1261incr_parse (CBOR *self, SV *cborstr)
1262{
1263 STRLEN cur;
1264 SvPV (cborstr, cur);
1265
1266 while (ecb_expect_true (self->incr_need <= cur))
1267 {
1268 // table of integer count bytes
1269 static I8 incr_len[MINOR_MASK + 1] = {
1270 0, 0, 0, 0, 0, 0, 0, 0,
1271 0, 0, 0, 0, 0, 0, 0, 0,
1272 0, 0, 0, 0, 0, 0, 0, 0,
1273 1, 2, 4, 8,-1,-1,-1,-2
1274 };
1275
1276 const U8 *p = SvPVX (cborstr) + self->incr_pos;
1277 U8 m = *p & MINOR_MASK;
1278 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1279 I8 ilen = incr_len[m];
1280
1281 self->incr_need = self->incr_pos + 1;
1282
1283 if (ecb_expect_false (ilen < 0))
1284 {
1285 if (m != MINOR_INDEF)
1286 return 1; // error
1287
1288 if (*p == (MAJOR_MISC | MINOR_INDEF))
1289 {
1290 if (count >= 0)
1291 return 1; // error
1292
1293 count = 1;
1294 }
1295 else
1296 {
1297 av_push (self->incr_count, newSViv (-1)); //TODO: nest
1298 count = -1;
1299 }
1300 }
1301 else
1302 {
1303 self->incr_need += ilen;
1304 if (ecb_expect_false (self->incr_need > cur))
1305 return 0;
1306
1307 int major = *p >> MAJOR_SHIFT;
1308
1309 switch (major)
1310 {
1311 case MAJOR_TAG >> MAJOR_SHIFT:
1312 ++count; // tags merely prefix another value
1313 break;
1314
1315 case MAJOR_BYTES >> MAJOR_SHIFT:
1316 case MAJOR_TEXT >> MAJOR_SHIFT:
1317 case MAJOR_ARRAY >> MAJOR_SHIFT:
1318 case MAJOR_MAP >> MAJOR_SHIFT:
1319 {
1320 UV len;
1321
1322 if (ecb_expect_false (ilen))
1323 {
1324 len = 0;
1325
1326 do {
1327 len = (len << 8) | *++p;
1328 } while (--ilen);
1329 }
1330 else
1331 len = m;
1332
1333 switch (major)
1334 {
1335 case MAJOR_BYTES >> MAJOR_SHIFT:
1336 case MAJOR_TEXT >> MAJOR_SHIFT:
1337 self->incr_need += len;
1338 if (ecb_expect_false (self->incr_need > cur))
1339 return 0;
1340
1341 break;
1342
1343 case MAJOR_MAP >> MAJOR_SHIFT:
1344 len <<= 1;
1345 case MAJOR_ARRAY >> MAJOR_SHIFT:
1346 if (len)
1347 {
1348 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1349 count = len + 1;
1350 }
1351 break;
1352 }
1353 }
1354 }
1355 }
1356
1357 self->incr_pos = self->incr_need;
1358
1359 if (count > 0)
1360 {
1361 while (!--count)
1362 {
1363 if (!AvFILLp (self->incr_count))
1364 return 1; // done
1365
1366 SvREFCNT_dec_NN (av_pop (self->incr_count));
1367 count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1368 }
1369
1370 SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
1371 }
1372 }
1373
1374 return 0;
1375}
1376
1377
1177///////////////////////////////////////////////////////////////////////////// 1378/////////////////////////////////////////////////////////////////////////////
1178// XS interface functions 1379// XS interface functions
1179 1380
1180MODULE = CBOR::XS PACKAGE = CBOR::XS 1381MODULE = CBOR::XS PACKAGE = CBOR::XS
1181 1382
… …
1193 1394
1194 default_filter = newSVpv ("CBOR::XS::default_filter", 0); 1395 default_filter = newSVpv ("CBOR::XS::default_filter", 0);
1195 1396
1196 sv_cbor = newSVpv ("CBOR", 0); 1397 sv_cbor = newSVpv ("CBOR", 0);
1197 SvREADONLY_on (sv_cbor); 1398 SvREADONLY_on (sv_cbor);
1399
1400 assert (("STRLEN must be an unsigned type", 0 <= (STRLEN)-1));
1198} 1401}
1199 1402
1200PROTOTYPES: DISABLE 1403PROTOTYPES: DISABLE
1201 1404
1202void CLONE (...) 1405void CLONE (...)
… …
1223 shrink = F_SHRINK 1426 shrink = F_SHRINK
1224 allow_unknown = F_ALLOW_UNKNOWN 1427 allow_unknown = F_ALLOW_UNKNOWN
1225 allow_sharing = F_ALLOW_SHARING 1428 allow_sharing = F_ALLOW_SHARING
1226 allow_cycles = F_ALLOW_CYCLES 1429 allow_cycles = F_ALLOW_CYCLES
1227 pack_strings = F_PACK_STRINGS 1430 pack_strings = F_PACK_STRINGS
1431 text_keys = F_TEXT_KEYS
1432 text_strings = F_TEXT_STRINGS
1433 validate_utf8 = F_VALIDATE_UTF8
1228 PPCODE: 1434 PPCODE:
1229{ 1435{
1230 if (enable) 1436 if (enable)
1231 self->flags |= ix; 1437 self->flags |= ix;
1232 else 1438 else
… …
1240 get_shrink = F_SHRINK 1446 get_shrink = F_SHRINK
1241 get_allow_unknown = F_ALLOW_UNKNOWN 1447 get_allow_unknown = F_ALLOW_UNKNOWN
1242 get_allow_sharing = F_ALLOW_SHARING 1448 get_allow_sharing = F_ALLOW_SHARING
1243 get_allow_cycles = F_ALLOW_CYCLES 1449 get_allow_cycles = F_ALLOW_CYCLES
1244 get_pack_strings = F_PACK_STRINGS 1450 get_pack_strings = F_PACK_STRINGS
1451 get_text_keys = F_TEXT_KEYS
1452 get_text_strings = F_TEXT_STRINGS
1453 get_validate_utf8 = F_VALIDATE_UTF8
1245 PPCODE: 1454 PPCODE:
1246 XPUSHs (boolSV (self->flags & ix)); 1455 XPUSHs (boolSV (self->flags & ix));
1247 1456
1248void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1457void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1249 PPCODE: 1458 PPCODE:
… …
1298 EXTEND (SP, 2); 1507 EXTEND (SP, 2);
1299 PUSHs (sv); 1508 PUSHs (sv);
1300 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1509 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1301} 1510}
1302 1511
1512void incr_parse (CBOR *self, SV *cborstr)
1513 ALIAS:
1514 incr_parse_multiple = 1
1515 PPCODE:
1516{
1517 if (SvUTF8 (cborstr))
1518 sv_utf8_downgrade (cborstr, 0);
1519
1520 if (!self->incr_count)
1521 {
1522 self->incr_count = newAV ();
1523 self->incr_pos = 0;
1524 self->incr_need = 1;
1525
1526 av_push (self->incr_count, newSViv (1));
1527 }
1528
1529 do
1530 {
1531 if (!incr_parse (self, cborstr))
1532 {
1533 if (self->incr_need > self->max_size && self->max_size)
1534 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1535 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1536
1537 break;
1538 }
1539
1540 SV *sv;
1541 char *offset;
1542
1543 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1544 XPUSHs (sv);
1545
1546 sv_chop (cborstr, offset);
1547
1548 av_clear (self->incr_count);
1549 av_push (self->incr_count, newSViv (1));
1550
1551 self->incr_pos = 0;
1552 self->incr_need = self->incr_pos + 1;
1553 }
1554 while (ix);
1555}
1556
1557void incr_reset (CBOR *self)
1558 CODE:
1559{
1560 SvREFCNT_dec (self->incr_count);
1561 self->incr_count = 0;
1562}
1563
1303void DESTROY (CBOR *self) 1564void DESTROY (CBOR *self)
1304 PPCODE: 1565 PPCODE:
1305 cbor_free (self); 1566 cbor_free (self);
1306 1567
1307PROTOTYPES: ENABLE 1568PROTOTYPES: ENABLE

Diff Legend

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