octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2025-01-03 07:12:28 +00:00
Code Issues Releases Wiki Activity

Change QUtil::read_file_into_string to work with pipes (fixes #1010)

Browse Source
This commit is contained in:
m-holger 2023-07-27 20:27:10 +01:00
parent c1afe9f83b
commit d7efc661ec
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libqpdf/QUtil.cc
View File

@ -1178,21 +1178,43 @@ std::string
QUtil::read_file_into_string(FILE* f, std::string_view filename) QUtil::read_file_into_string(FILE* f, std::string_view filename)
{ {
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
auto size = QIntC::to_size(QUtil::tell(f)); auto o_size = QUtil::tell(f);
fseek(f, 0, SEEK_SET); if (o_size >= 0) {
std::string result(size, '\0'); // Seekable file
if (auto read = fread(result.data(), 1, size, f); read != size) { auto size = QIntC::to_size(o_size);
fseek(f, 0, SEEK_SET);
std::string result(size, '\0');
if (auto n_read = fread(result.data(), 1, size, f); n_read != size) {
if (ferror(f)) {
throw std::runtime_error(
std::string("failure reading file ") + std::string(filename) +
" into memory: read " + uint_to_string(n_read) + "; wanted " +
uint_to_string(size));
} else {
throw std::runtime_error(
std::string("premature eof reading file ") + std::string(filename) +
" into memory: read " + uint_to_string(n_read) + "; wanted " +
uint_to_string(size));
}
}
return result;
} else {
// Pipe or other non-seekable file
size_t buf_size = 8192;
auto n_read = buf_size;
std::string buffer(buf_size, '\0');
std::string result;
while (n_read == buf_size) {
n_read = fread(buffer.data(), 1, buf_size, f);
buffer.erase(n_read);
result.append(buffer);
}
if (ferror(f)) { if (ferror(f)) {
throw std::runtime_error( throw std::runtime_error(
std::string("failure reading file ") + std::string(filename) + std::string("failure reading file ") + std::string(filename) + " into memory");
" into memory: read " + uint_to_string(read) + "; wanted " + uint_to_string(size));
} else {
throw std::runtime_error(
std::string("premature eof reading file ") + std::string(filename) +
" into memory: read " + uint_to_string(read) + "; wanted " + uint_to_string(size));
} }
return result;
} }
return result;
} }
static bool static bool