summaryrefslogtreecommitdiff
path: root/Source/cmFileCommand.cxx
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2022-01-04 18:38:32 +0100
committerAlexey Edelev <alexey.edelev@qt.io>2022-01-13 11:56:49 +0100
commitfd0c285b12f4235ba62e13489a6a09e487825cf6 (patch)
tree2e2e8633be5b015baed6a779b53a9d6dd747a0cd /Source/cmFileCommand.cxx
parent0c038689be424ca71a6699a993adde3bcaa15b6c (diff)
downloadcmake-fd0c285b12f4235ba62e13489a6a09e487825cf6.tar.gz
file: Fix types of the OFFSET and LIMIT arguments
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
Diffstat (limited to 'Source/cmFileCommand.cxx')
-rw-r--r--Source/cmFileCommand.cxx23
1 files changed, 9 insertions, 14 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index d9fb6083f3..da2f15fdfc 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -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) {