kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TD] Fix column index range checking bug in std::string DrawViewSpreadsheet::getSheetImage(void)

Browse Source
This commit is contained in:
Aapo
2020-11-20 19:56:47 +02:00
parent 71726a11d0
commit 6803af4dc4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/TechDraw/App/DrawViewSpreadsheet.cpp
View File

@@ -211,13 +211,6 @@ std::string DrawViewSpreadsheet::getSheetImage(void)
}
}
//check for logical range
if ( (sColStart > sColEnd) ||
(iRowStart > iRowEnd) ) {
Base::Console().Error("%s - cell range is illogical\n",getNameInDocument());
return result.str();
}
std::vector<std::string> availcolumns = getAvailColumns();
//validate range start column in sheet's available columns
@@ -236,6 +229,13 @@ std::string DrawViewSpreadsheet::getSheetImage(void)
return result.str();
}
//check for logical range
if ( (iAvailColStart > iAvailColEnd) ||
(iRowStart > iRowEnd) ) {
Base::Console().Error("%s - cell range is illogical\n",getNameInDocument());
return result.str();
}
// build row and column ranges
std::vector<std::string> validColNames;
std::vector<int> validRowNumbers;