MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-03-13 21:10:32 +01:00
Code Issues Releases Wiki Activity

ircd::json: Granular stringify size assertions.

Browse source
This commit is contained in:
Jason Volk 2018-03-27 16:45:56 -07:00
parent 49cb8fee1a
commit fb58bdf7de
1 changed files with 52 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
ircd/json.cc
View file

@ -804,7 +804,13 @@ ircd::json::stringify(mutable_buffer &buf,
printer(buf, printer.object_begin);
printer::list_protocol(buf, m, m + iov.size(), print_member);
printer(buf, printer.object_end);
return { start, begin(buf) };
const string_view ret
{
start, begin(buf)
};
assert(serialized(iov) == size(ret));
return ret;
}
size_t
@ -1029,7 +1035,13 @@ ircd::json::stringify(mutable_buffer &buf,
char *const start(begin(buf));
printer(buf, printer.name << printer.name_sep, member.first);
stringify(buf, member.second);
return string_view { start, begin(buf) };
const string_view ret
{
start, begin(buf)
};
assert(serialized(member) == size(ret));
return ret;
}
size_t
@ -1103,7 +1115,13 @@ ircd::json::stringify(mutable_buffer &buf,
printer(buf, printer.object_begin);
printer::list_protocol(buf, b, e, stringify_member);
printer(buf, printer.object_end);
return { start, begin(buf) };
const string_view ret
{
start, begin(buf)
};
assert(serialized(b, e) == size(ret));
return ret;
}
size_t
@ -1313,11 +1331,19 @@ ircd::json::array::stringify(mutable_buffer &buf,
}
};
char *const start(std::begin(buf));
using ircd::buffer::begin;
char *const start(begin(buf));
printer(buf, printer.array_begin);
printer::list_protocol(buf, b, e, print_element);
printer(buf, printer.array_end);
return { start, std::begin(buf) };
const string_view ret
{
start, begin(buf)
};
using ircd::buffer::size;
assert(serialized(b, e) == size(ret));
return ret;
}
template<class it>
@ -1482,7 +1508,13 @@ try
printer(buf, printer.object_begin);
printer::list_protocol(buf, m.data(), m.data() + i, print_member);
printer(buf, printer.object_end);
return { start, begin(buf) };
const string_view ret
{
start, begin(buf)
};
assert(serialized(b, e) == size(ret));
return ret;
}
catch(const std::out_of_range &)
{
@ -1563,7 +1595,13 @@ ircd::json::stringify(mutable_buffer &buf,
printer(buf, printer.array_begin);
printer::list_protocol(buf, b, e, print_value);
printer(buf, printer.array_end);
return { start, begin(buf) };
const string_view ret
{
start, begin(buf)
};
assert(serialized(b, e) == size(ret));
return ret;
}
ircd::string_view
@ -1649,7 +1687,13 @@ ircd::json::stringify(mutable_buffer &buf,
}
}
return { start, begin(buf) };
const string_view ret
{
start, begin(buf)
};
assert(serialized(v) == size(ret));
return ret;
}
size_t