mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-01 19:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

file: Fix types of the OFFSET and LIMIT arguments

Browse Source 
OFFSET argument cannot handle offsets bigger than INT_MAX because of
the atoi function, which is used to convert the argument string to integer.
Same applies for the LIMIT argument.
Use the steam based reading and 64-bit types to convert and store arguments
to avoid invalid values stored in the corresponding variables.

Fixes: #23076
This commit is contained in:
Alexey Edelev
2022-01-04 18:38:32 +01:00
parent 0c038689be
commit fd0c285b12
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmFileCommand.cxx
View File

@@ -199,14 +199,13 @@ bool HandleReadCommand(std::vector<std::string> const& args,
// is there a limit?
std::string::size_type sizeLimit = std::string::npos;
if (!arguments.Limit.empty()) {
sizeLimit =
static_cast<std::string::size_type>(atoi(arguments.Limit.c_str()));
std::istringstream(arguments.Limit) >> sizeLimit;
}
// is there an offset?
long offset = 0;
cmsys::ifstream::off_type offset = 0;
if (!arguments.Offset.empty()) {
offset = atoi(arguments.Offset.c_str());
std::istringstream(arguments.Offset) >> offset;
}
file.seekg(offset, std::ios::beg); // explicit ios::beg for IBM VisualAge 6
@@ -216,25 +215,21 @@ bool HandleReadCommand(std::vector<std::string> const& args,
if (arguments.Hex) {
// Convert part of the file into hex code
char c;
while ((sizeLimit != 0) && (file.get(c))) {
while ((sizeLimit > 0) && (file.get(c))) {
char hex[4];
snprintf(hex, sizeof(hex), "%.2x", c & 0xff);
output += hex;
if (sizeLimit > 0) {
sizeLimit--;
}
sizeLimit--;
}
} else {
std::string line;
bool has_newline = false;
while (
sizeLimit != 0 &&
sizeLimit > 0 &&
cmSystemTools::GetLineFromStream(file, line, &has_newline, sizeLimit)) {
if (sizeLimit > 0) {
sizeLimit = sizeLimit - static_cast<long>(line.size());
if (has_newline && sizeLimit > 0) {
sizeLimit--;
}
sizeLimit = sizeLimit - line.size();
if (has_newline && sizeLimit > 0) {
sizeLimit--;
}
output += line;
if (has_newline) {