diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-10-08 16:02:30 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-10-08 16:02:30 +0100 |
| commit | e93aba2bae8e76d1b1d2d9493742aa93c2b1b27b (patch) | |
| tree | cd193a7d25128f8d7a6c8258991282081cabf087 /libpqpp/pq-column.cpp | |
| parent | Anonymous namespace over static (diff) | |
| download | libdbpp-postgresql-e93aba2bae8e76d1b1d2d9493742aa93c2b1b27b.tar.bz2 libdbpp-postgresql-e93aba2bae8e76d1b1d2d9493742aa93c2b1b27b.tar.xz libdbpp-postgresql-e93aba2bae8e76d1b1d2d9493742aa93c2b1b27b.zip | |
Use unique_ptr for handling unescaped bytea column buffer
Diffstat (limited to 'libpqpp/pq-column.cpp')
| -rw-r--r-- | libpqpp/pq-column.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/libpqpp/pq-column.cpp b/libpqpp/pq-column.cpp index cd0d60c..f78863c 100644 --- a/libpqpp/pq-column.cpp +++ b/libpqpp/pq-column.cpp @@ -9,22 +9,13 @@ #include <cstdlib> #include <cstring> #include <libpq-fe.h> -#include <memory> #include <server/catalog/pg_type_d.h> PQ::Column::Column(const SelectBase * s, unsigned int i) : - DB::Column(PQfname(s->execRes, static_cast<int>(i)), i), sc(s), oid(PQftype(sc->execRes, static_cast<int>(colNo))), - buf(nullptr) + DB::Column(PQfname(s->execRes, static_cast<int>(i)), i), sc(s), oid(PQftype(sc->execRes, static_cast<int>(colNo))) { } -PQ::Column::~Column() -{ - if (buf) { - PQfreemem(buf); - } -} - bool PQ::Column::isNull() const { @@ -97,12 +88,10 @@ PQ::Column::apply(DB::HandleField & h) const h.timestamp(boost::posix_time::time_from_string(value())); break; case BYTEAOID: { - if (buf) { - PQfreemem(buf); - } - size_t len; - buf = PQunescapeBytea(reinterpret_cast<const unsigned char *>(value()), &len); - h.blob(DB::Blob(buf, len)); + size_t len = 0; + // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast) + buf = BufPtr {PQunescapeBytea(reinterpret_cast<const unsigned char *>(value()), &len)}; + h.blob(DB::Blob(buf.get(), len)); break; } } |