diff --git a/code/XFileParser.cpp b/code/XFileParser.cpp
index 36e70bc1c..a62aef414 100644
--- a/code/XFileParser.cpp
+++ b/code/XFileParser.cpp
@@ -214,6 +214,10 @@ XFileParser::XFileParser( const std::vector<char>& pBuffer)
 			AI_SWAP2(ofs); 
 			P += 4;
 
+			if (P + ofs > End + 2) {
+				throw DeadlyImportError("X: Unexpected EOF in compressed chunk");
+			}
+
 			// push data to the stream
 			stream.next_in   = (Bytef*)P;
 			stream.avail_in  = ofs;