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.54 by root, Sun Apr 24 20:08:41 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);
… …
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 I32 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 I32 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);
… …
970 if (!method) 1029 if (!method)
971 ERR ("cannot decode perl-object (package does not have a THAW method)"); 1030 ERR ("cannot decode perl-object (package does not have a THAW method)");
972 1031
973 dSP; 1032 dSP;
974 1033
975 ENTER; SAVETMPS; PUSHMARK (SP); 1034 ENTER; SAVETMPS;
1035 PUSHMARK (SP);
976 EXTEND (SP, len + 1); 1036 EXTEND (SP, len + 1);
977 // we re-bless the reference to get overload and other niceties right 1037 // we re-bless the reference to get overload and other niceties right
978 PUSHs (*av_fetch (av, 0, 1)); 1038 PUSHs (*av_fetch (av, 0, 1));
979 PUSHs (sv_cbor); 1039 PUSHs (sv_cbor);
980 1040
… …
1005 default: 1065 default:
1006 { 1066 {
1007 sv = decode_sv (dec); 1067 sv = decode_sv (dec);
1008 1068
1009 dSP; 1069 dSP;
1010 ENTER; SAVETMPS; PUSHMARK (SP); 1070 ENTER; SAVETMPS;
1071 SAVESTACK_POS ();
1072 PUSHMARK (SP);
1011 EXTEND (SP, 2); 1073 EXTEND (SP, 2);
1012 PUSHs (newSVuv (tag)); 1074 PUSHs (newSVuv (tag));
1013 PUSHs (sv); 1075 PUSHs (sv);
1014 1076
1015 PUTBACK; 1077 PUTBACK;
… …
1124 1186
1125 return newSVnv (ecb_binary64_to_double (fp)); 1187 return newSVnv (ecb_binary64_to_double (fp));
1126 } 1188 }
1127 1189
1128 // 0..19 unassigned simple 1190 // 0..19 unassigned simple
1129 // 24 reserved + unassigned (reserved values are not encodable) 1191 // 24 reserved + unassigned simple (reserved values are not encodable)
1192 // 28-30 unassigned misc
1193 // 31 break code
1130 default: 1194 default:
1131 ERR ("corrupted CBOR data (reserved/unassigned major 7 value)"); 1195 ERR ("corrupted CBOR data (reserved/unassigned/unexpected major 7 value)");
1132 } 1196 }
1133 1197
1134 break; 1198 break;
1135 } 1199 }
1136 1200
… …
1139} 1203}
1140 1204
1141static SV * 1205static SV *
1142decode_cbor (SV *string, CBOR *cbor, char **offset_return) 1206decode_cbor (SV *string, CBOR *cbor, char **offset_return)
1143{ 1207{
1144 dec_t dec = { }; 1208 dec_t dec = { 0 };
1145 SV *sv; 1209 SV *sv;
1146 STRLEN len; 1210 STRLEN len;
1147 char *data = SvPVbyte (string, len); 1211 char *data = SvPVbyte (string, len);
1148 1212
1149 if (len > cbor->max_size && cbor->max_size) 1213 if (len > cbor->max_size && cbor->max_size)
… …
1163 if (dec.cur != dec.end && !dec.err) 1227 if (dec.cur != dec.end && !dec.err)
1164 dec.err = "garbage after CBOR object"; 1228 dec.err = "garbage after CBOR object";
1165 1229
1166 if (dec.err) 1230 if (dec.err)
1167 { 1231 {
1232 if (dec.shareable)
1233 {
1234 // need to break cyclic links, which whould all be in shareable
1235 int i;
1236 SV **svp;
1237
1238 for (i = av_len (dec.shareable) + 1; i--; )
1239 if ((svp = av_fetch (dec.shareable, i, 0)))
1240 sv_setsv (*svp, &PL_sv_undef);
1241 }
1242
1168 SvREFCNT_dec (sv); 1243 SvREFCNT_dec (sv);
1169 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur); 1244 croak ("%s, at offset %d (octet 0x%02x)", dec.err, dec.cur - (U8 *)data, (int)(uint8_t)*dec.cur);
1170 } 1245 }
1171 1246
1172 sv = sv_2mortal (sv); 1247 sv = sv_2mortal (sv);
1173 1248
1174 return sv; 1249 return sv;
1175} 1250}
1176 1251
1252/////////////////////////////////////////////////////////////////////////////
1253// incremental parser
1254
1255#define INCR_DONE(cbor) (AvFILLp (cbor->incr_count) < 0)
1256
1257// returns 0 for notyet, 1 for success or error
1258static int
1259incr_parse (CBOR *self, SV *cborstr)
1260{
1261 STRLEN cur;
1262 SvPV (cborstr, cur);
1263
1264 while (ecb_expect_true (self->incr_need <= cur))
1265 {
1266 // table of integer count bytes
1267 static I8 incr_len[MINOR_MASK + 1] = {
1268 0, 0, 0, 0, 0, 0, 0, 0,
1269 0, 0, 0, 0, 0, 0, 0, 0,
1270 0, 0, 0, 0, 0, 0, 0, 0,
1271 1, 2, 4, 8,-1,-1,-1,-2
1272 };
1273
1274 const U8 *p = SvPVX (cborstr) + self->incr_pos;
1275 U8 m = *p & MINOR_MASK;
1276 IV count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1277 I8 ilen = incr_len[m];
1278
1279 self->incr_need = self->incr_pos + 1;
1280
1281 if (ecb_expect_false (ilen < 0))
1282 {
1283 if (m != MINOR_INDEF)
1284 return 1; // error
1285
1286 if (*p == (MAJOR_MISC | MINOR_INDEF))
1287 {
1288 if (count >= 0)
1289 return 1; // error
1290
1291 count = 1;
1292 }
1293 else
1294 {
1295 av_push (self->incr_count, newSViv (-1)); //TODO: nest
1296 count = -1;
1297 }
1298 }
1299 else
1300 {
1301 self->incr_need += ilen;
1302 if (ecb_expect_false (self->incr_need > cur))
1303 return 0;
1304
1305 int major = *p >> MAJOR_SHIFT;
1306
1307 switch (major)
1308 {
1309 case MAJOR_TAG >> MAJOR_SHIFT:
1310 ++count; // tags merely prefix another value
1311 break;
1312
1313 case MAJOR_BYTES >> MAJOR_SHIFT:
1314 case MAJOR_TEXT >> MAJOR_SHIFT:
1315 case MAJOR_ARRAY >> MAJOR_SHIFT:
1316 case MAJOR_MAP >> MAJOR_SHIFT:
1317 {
1318 UV len;
1319
1320 if (ecb_expect_false (ilen))
1321 {
1322 len = 0;
1323
1324 do {
1325 len = (len << 8) | *++p;
1326 } while (--ilen);
1327 }
1328 else
1329 len = m;
1330
1331 switch (major)
1332 {
1333 case MAJOR_BYTES >> MAJOR_SHIFT:
1334 case MAJOR_TEXT >> MAJOR_SHIFT:
1335 self->incr_need += len;
1336 if (ecb_expect_false (self->incr_need > cur))
1337 return 0;
1338
1339 break;
1340
1341 case MAJOR_MAP >> MAJOR_SHIFT:
1342 len <<= 1;
1343 case MAJOR_ARRAY >> MAJOR_SHIFT:
1344 if (len)
1345 {
1346 av_push (self->incr_count, newSViv (len + 1)); //TODO: nest
1347 count = len + 1;
1348 }
1349 break;
1350 }
1351 }
1352 }
1353 }
1354
1355 self->incr_pos = self->incr_need;
1356
1357 if (count > 0)
1358 {
1359 while (!--count)
1360 {
1361 if (!AvFILLp (self->incr_count))
1362 return 1; // done
1363
1364 SvREFCNT_dec_NN (av_pop (self->incr_count));
1365 count = SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]);
1366 }
1367
1368 SvIVX (AvARRAY (self->incr_count)[AvFILLp (self->incr_count)]) = count;
1369 }
1370 }
1371
1372 return 0;
1373}
1374
1375
1177///////////////////////////////////////////////////////////////////////////// 1376/////////////////////////////////////////////////////////////////////////////
1178// XS interface functions 1377// XS interface functions
1179 1378
1180MODULE = CBOR::XS PACKAGE = CBOR::XS 1379MODULE = CBOR::XS PACKAGE = CBOR::XS
1181 1380
… …
1223 shrink = F_SHRINK 1422 shrink = F_SHRINK
1224 allow_unknown = F_ALLOW_UNKNOWN 1423 allow_unknown = F_ALLOW_UNKNOWN
1225 allow_sharing = F_ALLOW_SHARING 1424 allow_sharing = F_ALLOW_SHARING
1226 allow_cycles = F_ALLOW_CYCLES 1425 allow_cycles = F_ALLOW_CYCLES
1227 pack_strings = F_PACK_STRINGS 1426 pack_strings = F_PACK_STRINGS
1427 text_keys = F_TEXT_KEYS
1428 text_strings = F_TEXT_STRINGS
1429 validate_utf8 = F_VALIDATE_UTF8
1228 PPCODE: 1430 PPCODE:
1229{ 1431{
1230 if (enable) 1432 if (enable)
1231 self->flags |= ix; 1433 self->flags |= ix;
1232 else 1434 else
… …
1240 get_shrink = F_SHRINK 1442 get_shrink = F_SHRINK
1241 get_allow_unknown = F_ALLOW_UNKNOWN 1443 get_allow_unknown = F_ALLOW_UNKNOWN
1242 get_allow_sharing = F_ALLOW_SHARING 1444 get_allow_sharing = F_ALLOW_SHARING
1243 get_allow_cycles = F_ALLOW_CYCLES 1445 get_allow_cycles = F_ALLOW_CYCLES
1244 get_pack_strings = F_PACK_STRINGS 1446 get_pack_strings = F_PACK_STRINGS
1447 get_text_keys = F_TEXT_KEYS
1448 get_text_strings = F_TEXT_STRINGS
1449 get_validate_utf8 = F_VALIDATE_UTF8
1245 PPCODE: 1450 PPCODE:
1246 XPUSHs (boolSV (self->flags & ix)); 1451 XPUSHs (boolSV (self->flags & ix));
1247 1452
1248void max_depth (CBOR *self, U32 max_depth = 0x80000000UL) 1453void max_depth (CBOR *self, U32 max_depth = 0x80000000UL)
1249 PPCODE: 1454 PPCODE:
… …
1298 EXTEND (SP, 2); 1503 EXTEND (SP, 2);
1299 PUSHs (sv); 1504 PUSHs (sv);
1300 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr)))); 1505 PUSHs (sv_2mortal (newSVuv (offset - SvPVX (cborstr))));
1301} 1506}
1302 1507
1508void incr_parse (CBOR *self, SV *cborstr)
1509 ALIAS:
1510 incr_parse_multiple = 1
1511 PPCODE:
1512{
1513 if (SvUTF8 (cborstr))
1514 sv_utf8_downgrade (cborstr, 0);
1515
1516 if (!self->incr_count)
1517 {
1518 self->incr_count = newAV ();
1519 self->incr_pos = 0;
1520 self->incr_need = 1;
1521
1522 av_push (self->incr_count, newSViv (1));
1523 }
1524
1525 do
1526 {
1527 if (!incr_parse (self, cborstr))
1528 {
1529 if (self->incr_need > self->max_size && self->max_size)
1530 croak ("attempted decode of CBOR text of %lu bytes size, but max_size is set to %lu",
1531 (unsigned long)self->incr_need, (unsigned long)self->max_size);
1532
1533 break;
1534 }
1535
1536 SV *sv;
1537 char *offset;
1538
1539 PUTBACK; sv = decode_cbor (cborstr, self, &offset); SPAGAIN;
1540 XPUSHs (sv);
1541
1542 sv_chop (cborstr, offset);
1543
1544 av_clear (self->incr_count);
1545 av_push (self->incr_count, newSViv (1));
1546
1547 self->incr_pos = 0;
1548 self->incr_need = self->incr_pos + 1;
1549 }
1550 while (ix);
1551}
1552
1553void incr_reset (CBOR *self)
1554 CODE:
1555{
1556 SvREFCNT_dec (self->incr_count);
1557 self->incr_count = 0;
1558}
1559
1303void DESTROY (CBOR *self) 1560void DESTROY (CBOR *self)
1304 PPCODE: 1561 PPCODE:
1305 cbor_free (self); 1562 cbor_free (self);
1306 1563
1307PROTOTYPES: ENABLE 1564PROTOTYPES: ENABLE

Diff Legend

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