vndb/fu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jsonfmt: Fix threading support + memory leak bug

Browse source
This commit is contained in:
Yorhel 2025-01-28 19:19:18 +01:00
parent 9c8ce3f782
commit 12326ca8e4
5 changed files with 79 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

51
c/jsonfmt.c
View file

@ -1,8 +1,9 @@
static void fujson_fmt(fustr *, SV *);
static void fujson_fmt(pTHX_ fustr *, SV *);
static void fujson_fmt_str(fustr *out, const char *stri, size_t len, int utf8) {
static void fujson_fmt_str(pTHX_ fustr *out, const char *stri, size_t len, int utf8) {
size_t off = 0, loff;
const unsigned char *str = (const unsigned char *)stri;
unsigned char *buf;
unsigned char x = 0;
/* Validate entire string for conformance if this is flagged as a utf8
@ -35,7 +36,7 @@ static void fujson_fmt_str(fustr *out, const char *stri, size_t len, int utf8) {
off++;
}
}
fustr_write(out, str+loff, off-loff);
fustr_write(out, (char *)str+loff, off-loff);
if (off < len) { /* early break, which means current byte needs special processing */
switch (x) {
@ -48,16 +49,14 @@ static void fujson_fmt_str(fustr *out, const char *stri, size_t len, int utf8) {
case 0x0d: fustr_write(out, "\\r", 2); break;
default:
if (x < 0x80) {
fustr_reserve(out, 6);
memcpy(out->buf+out->len, "\\u00", 4);
out->buf[out->len+4] = PL_hexdigit[(x >> 4) & 0x0f];
out->buf[out->len+5] = PL_hexdigit[x & 0x0f];
out->len += 6;
buf = (unsigned char *)fustr_write_buf(out, 6);
memcpy(buf, "\\u00", 4);
buf[4] = PL_hexdigit[(x >> 4) & 0x0f];
buf[5] = PL_hexdigit[x & 0x0f];
} else { /* x >= 0x80, !utf8, so encode as 2-byte UTF-8 */
fustr_reserve(out, 2);
out->buf[out->len ] = 0xc0 | (x >> 6);
out->buf[out->len+1] = 0x80 | (x & 0x3f);
out->len += 2;
buf = (unsigned char *)fustr_write_buf(out, 2);
buf[0] = 0xc0 | (x >> 6);
buf[1] = 0x80 | (x & 0x3f);
}
}
off++;
@ -80,7 +79,7 @@ static const char fujson_digits[] =
"80818283848586878889"
"90919293949596979899";
static void fujson_fmt_int(fustr *out, SV *val) {
static void fujson_fmt_int(pTHX_ fustr *out, SV *val) {
char buf[32];
char *r = buf+31;
int neg = 0;
@ -111,19 +110,19 @@ static void fujson_fmt_int(fustr *out, SV *val) {
fustr_write(out, r, uv);
}
static void fujson_fmt_av(fustr *out, AV *av) {
static void fujson_fmt_av(pTHX_ fustr *out, AV *av) {
int i, len = av_count(av);
fustr_write(out, "[", 1);
for (i=0; i<len; i++) {
if (i) fustr_write(out, ",", 1);
SV **sv = av_fetch(av, i, 0);
if (sv) fujson_fmt(out, *sv); /* sv will have magic if av is tied, but fujson_fmt() handles that. */
if (sv) fujson_fmt(aTHX_ out, *sv); /* sv will have magic if av is tied, but fujson_fmt() handles that. */
else fustr_write(out, "null", 4);
}
fustr_write(out, "]", 1);
}
static void fujson_fmt_hv(fustr *out, HV *hv) {
static void fujson_fmt_hv(pTHX_ fustr *out, HV *hv) {
HE *he;
STRLEN helen;
char *hestr = NULL;
@ -133,16 +132,15 @@ static void fujson_fmt_hv(fustr *out, HV *hv) {
while ((he = hv_iternext(hv))) {
if (hestr) fustr_write(out, ",", 1);
hestr = HePV(he, helen);
fujson_fmt_str(out, hestr, helen, HeUTF8(he));
fujson_fmt_str(aTHX_ out, hestr, helen, HeUTF8(he));
fustr_write(out, ":", 1);
fujson_fmt(out, UNLIKELY(SvMAGICAL(hv)) ? hv_iterval(hv, he) : HeVAL(he));
fujson_fmt(aTHX_ out, UNLIKELY(SvMAGICAL(hv)) ? hv_iterval(hv, he) : HeVAL(he));
}
fustr_write(out, "}", 1);
}
/* BUG: Leaks *out on error, that should be on the temp stack */
static void fujson_fmt(fustr *out, SV *val) {
static void fujson_fmt(pTHX_ fustr *out, SV *val) {
SvGETMAGIC(val);
/* XXX: &PL_sv_yes and &PL_sv_no are proper booleans under 5.40, so no need
@ -151,22 +149,22 @@ static void fujson_fmt(fustr *out, SV *val) {
if (BOOL_INTERNALS_sv_isbool_true(val)) fustr_write(out, "true", 4);
else fustr_write(out, "false", 5);
} else if (SvPOKp(val)) {
fujson_fmt_str(out, SvPVX(val), SvCUR(val), SvUTF8(val));
fujson_fmt_str(aTHX_ out, SvPVX(val), SvCUR(val), SvUTF8(val));
} else if (SvNOKp(val)) { /* Must check before IOKp, because integer conversion might have been lossy */
/* TODO: quadmath? */
NV nv = SvNV_nomg(val);
if (isinfnan(nv)) return; /* TODO: error */
fustr_reserve(out, NV_DIG+1);
Gconvert(nv, NV_DIG, 0, out->buf + out->len);
out->len += strlen(out->buf + out->len);
Gconvert(nv, NV_DIG, 0, out->cur);
out->cur += strlen(out->cur);
} else if (SvIOKp(val)) {
fujson_fmt_int(out, val);
fujson_fmt_int(aTHX_ out, val);
} else if (SvROK(val)) {
SV *rv = SvRV(val);
SvGETMAGIC(rv);
if (UNLIKELY(SvOBJECT(rv))) { /* TODO: Check for TO_JSON */ }
else if (SvTYPE(rv) == SVt_PVHV) fujson_fmt_hv(out, (HV *)rv);
else if (SvTYPE(rv) == SVt_PVAV) fujson_fmt_av(out, (AV *)rv);
else if (SvTYPE(rv) == SVt_PVHV) fujson_fmt_hv(aTHX_ out, (HV *)rv);
else if (SvTYPE(rv) == SVt_PVAV) fujson_fmt_av(aTHX_ out, (AV *)rv);
else return; /* TODO: error */
} else if (!SvOK(val)) {
fustr_write(out, "null", 4);
@ -178,4 +176,3 @@ static void fujson_fmt(fustr *out, SV *val) {
/* TODO: canonical */
/* TODO: pretty */
/* TODO: max depth? */
/* TODO: threading support */