adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 17:33:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove several more "size - 1", none of which are dangereous."

Browse Source 
This reverts commit bcabf9b55c.

I should test code better...
This commit is contained in:
Alexey Sokolov
2017-10-04 04:41:50 +01:00
parent bcabf9b55c
commit 023e57485b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Message.cpp
+1 -1
View File
@@ -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;
src/Template.cpp
+3 -3
View File
@@ -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");
}