|
 |
a23e4d5 |
From c6755a399e8a31cbee5129dde5124f9c54a47ab6 Mon Sep 17 00:00:00 2001
|
|
|
a23e4d5 |
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
|
|
|
a23e4d5 |
Date: Wed, 4 Apr 2018 14:58:03 +0200
|
|
|
a23e4d5 |
Subject: [PATCH] Do not call back() on an empty vector
|
|
|
a23e4d5 |
MIME-Version: 1.0
|
|
|
a23e4d5 |
Content-Type: text/plain; charset=UTF-8
|
|
|
a23e4d5 |
Content-Transfer-Encoding: 8bit
|
|
|
a23e4d5 |
|
|
|
a23e4d5 |
Calling std::vector::back() on an empty container is undefined.
|
|
|
a23e4d5 |
Avoid doing that, simply return pointer to the beginning in case
|
|
|
a23e4d5 |
the vector is empty.
|
|
|
a23e4d5 |
|
|
|
a23e4d5 |
Signed-off-by: Nikola Forró <nforro@redhat.com>
|
|
|
a23e4d5 |
---
|
|
|
a23e4d5 |
common/vector.hpp | 6 +++---
|
|
|
a23e4d5 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
a23e4d5 |
|
|
|
a23e4d5 |
diff --git a/common/vector.hpp b/common/vector.hpp
|
|
|
a23e4d5 |
index 782e4b0..cb344bd 100644
|
|
|
a23e4d5 |
--- a/common/vector.hpp
|
|
|
a23e4d5 |
+++ b/common/vector.hpp
|
|
|
a23e4d5 |
@@ -36,13 +36,13 @@ namespace acommon
|
|
|
a23e4d5 |
}
|
|
|
a23e4d5 |
T * data() {return &*this->begin();}
|
|
|
a23e4d5 |
T * data(int pos) {return &*this->begin() + pos;}
|
|
|
a23e4d5 |
- T * data_end() {return &this->back()+1;}
|
|
|
a23e4d5 |
+ T * data_end() {return this->empty() ? &*this->begin() : &this->back()+1;}
|
|
|
a23e4d5 |
|
|
|
a23e4d5 |
T * pbegin() {return &*this->begin();}
|
|
|
a23e4d5 |
- T * pend() {return &this->back()+1;}
|
|
|
a23e4d5 |
+ T * pend() {return this->empty() ? &*this->begin() : &this->back()+1;}
|
|
|
a23e4d5 |
|
|
|
a23e4d5 |
const T * pbegin() const {return &*this->begin();}
|
|
|
a23e4d5 |
- const T * pend() const {return &this->back()+1;}
|
|
|
a23e4d5 |
+ const T * pend() const {return this->empty() ? &*this->begin() : &this->back()+1;}
|
|
|
a23e4d5 |
|
|
|
a23e4d5 |
template <typename U>
|
|
|
a23e4d5 |
U * datap() {
|