Merge pull request WebAssembly#301 from pjuftring/file-size_check

kripken · kripken · commit 57bd72bee015 · 2016-03-31T11:08:49.000-07:00
Repair broken file-size check
diff --git a/src/support/file.cpp b/src/support/file.cpp
@@ -29,7 +29,7 @@ T wasm::read_file(const std::string &filename, bool debug) {
   }
   infile.seekg(0, std::ios::end);
   std::streampos insize = infile.tellg();
-  if (size_t(insize) >= std::numeric_limits<size_t>::max()) {
+  if (uint64_t(insize) >= std::numeric_limits<size_t>::max()) {
     // Building a 32-bit executable where size_t == 32 bits, we are not able to create strings larger than 2^32 bytes in length, so must abort here.
     std::cerr << "Failed opening '" << filename << "': Input file too large: " << insize << " bytes. Try rebuilding in 64-bit mode." << std::endl;
     exit(EXIT_FAILURE);

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ T wasm::read_file(const std::string &filename, bool debug) {`
`29`	`29`	`}`
`30`	`30`	`infile.seekg(0, std::ios::end);`
`31`	`31`	`std::streampos insize = infile.tellg();`
`32`		`- if (size_t(insize) >= std::numeric_limits<size_t>::max()) {`
	`32`	`+ if (uint64_t(insize) >= std::numeric_limits<size_t>::max()) {`
`33`	`33`	`// Building a 32-bit executable where size_t == 32 bits, we are not able to create strings larger than 2^32 bytes in length, so must abort here.`
`34`	`34`	`std::cerr << "Failed opening '" << filename << "': Input file too large: " << insize << " bytes. Try rebuilding in 64-bit mode." << std::endl;`
`35`	`35`	`exit(EXIT_FAILURE);`