From 023e57485ba33bbbb000e480bf63244a723b8f51 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Wed, 4 Oct 2017 04:41:50 +0100 Subject: [PATCH] Revert "Remove several more "size - 1", none of which are dangereous." This reverts commit bcabf9b55c0ffa3d73f66c1518f80132133d59e3. I should test code better... --- src/Message.cpp | 2 +- src/Template.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Message.cpp b/src/Message.cpp index 1ef97edd..5be5e1ed 100644 --- a/src/Message.cpp +++ b/src/Message.cpp @@ -52,7 +52,7 @@ CString CMessage::GetParams(unsigned int uIdx, unsigned int uLen) const { if (m_vsParams.empty() || uLen == 0) { return ""; } - if (uLen + uIdx + 1 > m_vsParams.size()) { + if (uLen > m_vsParams.size() - uIdx - 1) { uLen = m_vsParams.size() - uIdx; } VCString vsParams; diff --git a/src/Template.cpp b/src/Template.cpp index f559acc9..3eb4a772 100644 --- a/src/Template.cpp +++ b/src/Template.cpp @@ -72,13 +72,13 @@ CString CTemplateLoopContext::GetValue(const CString& sName, bool bFromIf) { } else if (sName.Equals("__FIRST__")) { return ((GetRowIndex() == 0) ? "1" : ""); } else if (sName.Equals("__LAST__")) { - return ((GetRowIndex() + 1 == m_pvRows->size()) ? "1" : ""); + return ((GetRowIndex() == m_pvRows->size() - 1) ? "1" : ""); } else if (sName.Equals("__OUTER__")) { - return ((GetRowIndex() == 0 || GetRowIndex() + 1 == m_pvRows->size()) + return ((GetRowIndex() == 0 || GetRowIndex() == m_pvRows->size() - 1) ? "1" : ""); } else if (sName.Equals("__INNER__")) { - return ((GetRowIndex() == 0 || GetRowIndex() + 1 == m_pvRows->size()) + return ((GetRowIndex() == 0 || GetRowIndex() == m_pvRows->size() - 1) ? "" : "1"); }