Skip to content

Commit 04703ca

Browse files
committed
Fix CID 1164579 (Explicit null dereferenced)
The report from Coverity Scan is a false positive. Nevertheless the code can be rewritten and optimized a little bit to fix that report. Signed-off-by: Stefan Weil <sw@weilnetz.de>
1 parent 9a1f14f commit 04703ca

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/ccutil/genericvector.h

+8-3
Original file line numberDiff line numberDiff line change
@@ -661,11 +661,16 @@ class GenericVectorEqEq : public GenericVector<T> {
661661
template <typename T>
662662
void GenericVector<T>::init(int size) {
663663
size_used_ = 0;
664-
size_reserved_ = 0;
665-
data_ = nullptr;
664+
if (size <= 0) {
665+
data_ = nullptr;
666+
size_reserved_ = 0;
667+
} else {
668+
if (size < kDefaultVectorSize) size = kDefaultVectorSize;
669+
data_ = new T[size];
670+
size_reserved_ = size;
671+
}
666672
clear_cb_ = nullptr;
667673
compare_cb_ = nullptr;
668-
reserve(size);
669674
}
670675

671676
template <typename T>

0 commit comments

Comments
 (0)