diff options
author | Jade Lovelace <lix@jade.fyi> | 2024-08-22 22:44:29 -0700 |
---|---|---|
committer | Rebecca Turner <rbt@sent.as> | 2024-08-26 16:13:03 -0700 |
commit | 0cc285f87b25365b6050753fba76713332185012 (patch) | |
tree | 6465237250ec825a5f6cde593dad73e8c9563eac /src/libutil/serialise.hh | |
parent | ca08f1217d8779971d4f2b306a19ad5622360372 (diff) |
treewide: fix a bunch of lints
Fixes:
- Identifiers starting with _ are prohibited
- Some driveby header dependency cleaning which wound up with doing some
extra fixups.
- Fucking C style casts, man. C++ made these 1000% worse by letting you
also do memory corruption with them with references.
- Remove casts to Expr * where ExprBlackHole is an incomplete type by
introducing an explicitly-cast eBlackHoleAddr as Expr *.
- An incredibly illegal cast of the text bytes of the StorePath hash
into a size_t directly. You can't DO THAT.
Replaced with actually parsing the hash so we get 100% of the bits
being entropy, then memcpying the start of the hash. If this shows
up in a profile we should just make the hash parser faster with a
lookup table or something sensible like that.
- This horrendous bit of UB which I thankfully slapped a deprecation
warning on, built, and it didn't trigger anywhere so it was dead
code and I just deleted it. But holy crap you *cannot* do that.
inline void mkString(const Symbol & s)
{
mkString(((const std::string &) s).c_str());
}
- Some wrong lints. Lots of wrong macro lints, one wrong
suspicious-sizeof lint triggered by the template being instantiated
with only pointers, but the calculation being correct for both
pointers and not-pointers.
- Exceptions in destructors strike again. I tried to catch the
exceptions that might actually happen rather than all the exceptions
imaginable. We can let the runtime hard-kill it on other exceptions
imo.
Change-Id: I71761620846cba64d66ee7ca231b20c061e69710
Diffstat (limited to 'src/libutil/serialise.hh')
-rw-r--r-- | src/libutil/serialise.hh | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh index 8218db440..d6a22b3e9 100644 --- a/src/libutil/serialise.hh +++ b/src/libutil/serialise.hh @@ -4,6 +4,7 @@ #include <concepts> #include <memory> +#include "charptr-cast.hh" #include "generator.hh" #include "strings.hh" #include "types.hh" @@ -385,7 +386,7 @@ struct SerializingTransform buf[5] = (n >> 40) & 0xff; buf[6] = (n >> 48) & 0xff; buf[7] = (unsigned char) (n >> 56) & 0xff; - return {reinterpret_cast<const char *>(buf.begin()), 8}; + return {charptr_cast<const char *>(buf.begin()), 8}; } static Bytes padding(size_t unpadded) @@ -417,6 +418,9 @@ struct SerializingTransform void writePadding(size_t len, Sink & sink); +// NOLINTBEGIN(cppcoreguidelines-avoid-capturing-lambda-coroutines): +// These coroutines do their entire job before the semicolon and are not +// retained, so they live long enough. inline Sink & operator<<(Sink & sink, uint64_t u) { return sink << [&]() -> WireFormatGenerator { co_yield u; }(); @@ -441,6 +445,7 @@ inline Sink & operator<<(Sink & sink, const Error & ex) { return sink << [&]() -> WireFormatGenerator { co_yield ex; }(); } +// NOLINTEND(cppcoreguidelines-avoid-capturing-lambda-coroutines) MakeError(SerialisationError, Error); @@ -448,7 +453,7 @@ template<typename T> T readNum(Source & source) { unsigned char buf[8]; - source((char *) buf, sizeof(buf)); + source(charptr_cast<char *>(buf), sizeof(buf)); auto n = readLittleEndian<uint64_t>(buf); @@ -540,13 +545,17 @@ struct FramedSource : Source ~FramedSource() { - if (!eof) { - while (true) { - auto n = readInt(from); - if (!n) break; - std::vector<char> data(n); - from(data.data(), n); + try { + if (!eof) { + while (true) { + auto n = readInt(from); + if (!n) break; + std::vector<char> data(n); + from(data.data(), n); + } } + } catch (...) { + ignoreException(); } } |