From 503646a3317c1041fb5ded803a3935ef330ea036 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 8 Jul 2018 10:34:27 -0700 Subject: [PATCH] QCborValue: Silence Coverity warning about null-pointer dereference MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's a false positive, since we've checked that the item HasByteData. But it's cheap to rewrite so the warning is silenced. >>> CID 190741: Null pointer dereferences (NULL_RETURNS) >>> Dereferencing a null pointer "this->byteData(idx)". Change-Id: If48c5c2e920c433298f1fffd153f7534be42a30b Reviewed-by: Mårten Nordheim Reviewed-by: Edward Welbourne --- src/corelib/serialization/qcborvalue_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/serialization/qcborvalue_p.h b/src/corelib/serialization/qcborvalue_p.h index f6c0cfae3d..02aa05bcdb 100644 --- a/src/corelib/serialization/qcborvalue_p.h +++ b/src/corelib/serialization/qcborvalue_p.h @@ -205,8 +205,8 @@ public: e.container->deref(); e.container = nullptr; e.flags = {}; - } else if (e.flags & QtCbor::Element::HasByteData) { - usedData -= byteData(idx)->len + sizeof(QtCbor::ByteData); + } else if (auto b = byteData(e)) { + usedData -= b->len + sizeof(QtCbor::ByteData); } replaceAt_internal(e, value, disp); }