0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check if the input file is good before attempting compression.

Browse source 
This works around boost bug #7561
This commit is contained in:
Alexander van Gessel 2012-10-24 10:36:00 +01:00
parent 69bc7422d8
commit bbbd712961
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game.cpp
View file

@ -80,10 +80,15 @@ template <typename filter>
static void encode(const std::string & input_file, const std::string & output_file)
{
try {
std::ofstream ofile(output_file.c_str(), std::ios_base::out
| std::ios_base::binary);
std::ifstream ifile(input_file.c_str(),
std::ios_base::in | std::ios_base::binary);
ifile.peek(); // We need to touch the stream to set the eof bit
if(!ifile.good()) {
std::cerr << "Input file " << input_file << " is not good for reading. Exiting to prevent bzip2 from segfaulting\n";
safe_exit(1);
}
std::ofstream ofile(output_file.c_str(), std::ios_base::out
| std::ios_base::binary);
boost::iostreams::filtering_stream<boost::iostreams::output> stream;
stream.push(filter());
stream.push(ofile);