2009-08-19 Massimiliano Mantione <massi@ximian.com>

	* Reader.cs:
	Return null when file ends without an EndBlock, instead of throwing
	an exception.  This supports intermediate parsing of log files
	during suspend/resume operations.

svn path=/trunk/mono-tools/; revision=140260

2 files changed, 14 insertions, 2 deletions

diff --git a/Mono.Profiler/profiler-decoder-library/ChangeLog b/Mono.Profiler/profiler-decoder-library/ChangeLog
index 42fa12c0..04713220 100644
--- a/Mono.Profiler/profiler-decoder-library/ChangeLog
+++ b/Mono.Profiler/profiler-decoder-library/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-19  Massimiliano Mantione <massi@ximian.com>
+	* Reader.cs:
+	Return null when file ends without an EndBlock, instead of throwing
+	an exception.  This supports intermediate parsing of log files
+	during suspend/resume operations.
+
 2009-07-15  Mike Kestner <mkestner@novell.com>
 	* Reader.cs: add a Close method to explicitly close the stream.
 
diff --git a/Mono.Profiler/profiler-decoder-library/Reader.cs b/Mono.Profiler/profiler-decoder-library/Reader.cs
index c6f1b537..1fbb4458 100644
--- a/Mono.Profiler/profiler-decoder-library/Reader.cs
+++ b/Mono.Profiler/profiler-decoder-library/Reader.cs
@@ -85,10 +85,16 @@ namespace  Mono.Profiler {
 				byte [] block;
 				BlockCode code;
 				int length;
-				BlockData result;
+				int bytesRead;
+				BlockData result = null;
 				
 				header = new byte [BlockData.BLOCK_HEADER_SIZE];
-				stream.Read (header, 0, BlockData.BLOCK_HEADER_SIZE);
+				bytesRead = stream.Read (header, 0, BlockData.BLOCK_HEADER_SIZE);
+				if (bytesRead == 0) {
+					return null;
+				} else if (bytesRead < BlockData.BLOCK_HEADER_SIZE) {
+					throw new DecodingException (result, 0, String.Format ("Invalid header: length is {0} instead of {1}", bytesRead, BlockData.BLOCK_HEADER_SIZE));
+				}
 				fileOffset += (uint) BlockData.BLOCK_HEADER_SIZE;
 				
 				code = BlockData.DecodeHeaderBlockCode (header);