|
 |
819d24 |
From 5803e81d488e97623fe29b8629b977be01a8229e Mon Sep 17 00:00:00 2001
|
|
|
819d24 |
From: Mark Dufour <m.dufour@kopano.com>
|
|
|
819d24 |
Date: Mon, 6 Mar 2017 21:16:41 +0100
|
|
|
819d24 |
Subject: [PATCH] Fix Coverity issue reported for setslice (pycontainer.swg):
|
|
|
819d24 |
|
|
|
819d24 |
"CID 11151 (#3-1 of 3): Using invalid iterator (INVALIDATE_ITERATOR)18.
|
|
|
819d24 |
increment_iterator: Incrementing iterator it though it is already past
|
|
|
819d24 |
the end of its container."
|
|
|
819d24 |
|
|
|
819d24 |
Coverity does not understand 'replace_count', so warns that we may go
|
|
|
819d24 |
past self->end() (or self->rend() I guess).
|
|
|
819d24 |
---
|
|
|
819d24 |
Lib/python/pycontainer.swg | 4 ++--
|
|
|
819d24 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
819d24 |
|
|
|
819d24 |
diff --git a/Lib/python/pycontainer.swg b/Lib/python/pycontainer.swg
|
|
|
819d24 |
index d40b0baa8..9aefb4fc7 100644
|
|
|
819d24 |
--- a/Lib/python/pycontainer.swg
|
|
|
819d24 |
+++ b/Lib/python/pycontainer.swg
|
|
|
819d24 |
@@ -351,7 +351,7 @@ namespace swig {
|
|
|
819d24 |
typename Sequence::const_iterator isit = is.begin();
|
|
|
819d24 |
typename Sequence::iterator it = self->begin();
|
|
|
819d24 |
std::advance(it,ii);
|
|
|
819d24 |
- for (size_t rc=0; rc
|
|
|
819d24 |
+ for (size_t rc=0; rc<replacecount && it != self->end(); ++rc) {
|
|
|
819d24 |
*it++ = *isit++;
|
|
|
819d24 |
for (Py_ssize_t c=0; c<(step-1) && it != self->end(); ++c)
|
|
|
819d24 |
it++;
|
|
|
819d24 |
@@ -367,7 +367,7 @@ namespace swig {
|
|
|
819d24 |
typename Sequence::const_iterator isit = is.begin();
|
|
|
819d24 |
typename Sequence::reverse_iterator it = self->rbegin();
|
|
|
819d24 |
std::advance(it,size-ii-1);
|
|
|
819d24 |
- for (size_t rc=0; rc
|
|
|
819d24 |
+ for (size_t rc=0; rc<replacecount && it != self->rend(); ++rc) {
|
|
|
819d24 |
*it++ = *isit++;
|
|
|
819d24 |
for (Py_ssize_t c=0; c<(-step-1) && it != self->rend(); ++c)
|
|
|
819d24 |
it++;
|
|
|
819d24 |
--
|
|
|
819d24 |
2.14.3
|
|
|
819d24 |
|