diff --git a/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaForm.cxx b/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaForm.cxx index 1eaca976163..884cfec956a 100644 --- a/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaForm.cxx +++ b/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaForm.cxx @@ -591,8 +591,6 @@ MetaForm::ReadStream(METAIO_STREAM::ifstream * _stream) MetaForm::M_Destroy(); - fflush(nullptr); - Clear(); M_SetupReadFields(); diff --git a/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaObject.cxx b/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaObject.cxx index f0f36b9d5b3..0ca694a9da6 100644 --- a/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaObject.cxx +++ b/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaObject.cxx @@ -357,8 +357,6 @@ MetaObject::ReadStream(int _nDims, METAIO_STREAM::ifstream * _stream) MetaObject::M_Destroy(); - fflush(nullptr); - Clear(); M_SetupReadFields(); diff --git a/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaUtils.cxx b/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaUtils.cxx index 2244c819e37..e37635bf36a 100644 --- a/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaUtils.cxx +++ b/Modules/ThirdParty/MetaIO/src/MetaIO/src/metaUtils.cxx @@ -891,6 +891,12 @@ MET_PerformUncompression(const unsigned char * sourceCompressed, } while (d_stream.avail_out == 0); } while (err != Z_STREAM_END && err >= 0); inflateEnd(&d_stream); + if (err != Z_STREAM_END) + { + std::cerr << "MET_PerformUncompression: compressed stream did not terminate cleanly (zlib error " << err << ")" + << '\n'; + return false; + } if (dest_pos != uncompressedDataSize) { std::cerr << "MET_PerformUncompression: expected " << uncompressedDataSize << " bytes, produced " << dest_pos