Merge pull request #52 from cwensley/check-eofs

Check for EOF instead of always throwing exceptions when loading files
cwensley · Sep 12, 2022 · f7aff76 · f7aff76
2 parents 9d94913 + bb9ffa9
commit f7aff76
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 14 deletions.
diff --git a/Source/Pablo/Formats/Character/Types/Adf.cs b/Source/Pablo/Formats/Character/Types/Adf.cs
@@ -54,7 +54,7 @@ public override void Load (Stream fs, CharacterDocument doc, CharacterHandler ha
 				page.Font.Load (br);
 
 				WaitEventArgs args = new WaitEventArgs ();
-				while (true) {
+				while (!fs.IsEOF()) {
 					p.X = rClip.Left;
 					for (int x=0; x<80; x++) {
 						byte ch = br.ReadByte ();

diff --git a/Source/Pablo/Formats/Character/Types/Ansi.cs b/Source/Pablo/Formats/Character/Types/Ansi.cs
@@ -49,7 +49,7 @@ public override bool DetectAnimation (Stream stream)
 				var bs = new BufferedStream (stream, 1024);
 				var br = new BinaryReader (bs);
 				int read = 0;
-				while (read < 2048 && true) {
+				while (read < 2048 && !stream.IsEOF()) {
 					byte curByte = br.ReadByte ();
 					read++;
 					if (curByte == 27) {

diff --git a/Source/Pablo/Formats/Character/Types/Ansi.load.cs b/Source/Pablo/Formats/Character/Types/Ansi.load.cs
@@ -498,7 +498,7 @@ public void Load(Stream fs, Canvas canvas, Palette palette, WaitEventHandler onW
 				{
 					var args = new WaitEventArgs();
 					byte curByte = br.ReadByte();
-					while (true && (!fs.CanSeek || fs.Position < fs.Length))
+					while (!fs.IsEOF())
 					{
 						if (onWait != null)
 							onWait(this, args);

diff --git a/Source/Pablo/Formats/Character/Types/Atascii.cs b/Source/Pablo/Formats/Character/Types/Atascii.cs
@@ -52,7 +52,7 @@ public override bool DetectAnimation(Stream stream)
 			{
 
 				var br = new BinaryReader(stream);
-				while (true)
+				while (!stream.IsEOF())
 				{
 					byte b = br.ReadByte();
 					switch (b)
@@ -154,7 +154,7 @@ public override void Load(Stream fs, CharacterDocument document, CharacterHandle
 				var ce = new CanvasElement(32, 7);
 				p = rClip.Location;
 				var args = new WaitEventArgs();
-				while (true)
+				while (!fs.IsEOF())
 				{
 					document.OnWait(args);
 					if (args.Exit)

diff --git a/Source/Pablo/Formats/Character/Types/Avatar.cs b/Source/Pablo/Formats/Character/Types/Avatar.cs
@@ -69,7 +69,7 @@ public override void Load(Stream fs, CharacterDocument doc, CharacterHandler han
 			try
 			{
 				WaitEventArgs args = new WaitEventArgs();
-				while (true)
+				while (!fs.IsEOF())
 				{
 					doc.OnWait(args);
 					if (args.Exit)

diff --git a/Source/Pablo/Formats/Character/Types/Binary.cs b/Source/Pablo/Formats/Character/Types/Binary.cs
@@ -111,7 +111,7 @@ public override void Load(Stream fs, CharacterDocument doc, CharacterHandler han
 				CanvasElement ce = new CanvasElement(32, 7);
 				p = rClip.Location;
 				WaitEventArgs args = new WaitEventArgs();
-				while (true)
+				while (!fs.IsEOF())
 				{
 					doc.OnWait(args);
 					if (args.Exit)

diff --git a/Source/Pablo/Formats/Character/Types/CG.cs b/Source/Pablo/Formats/Character/Types/CG.cs
@@ -52,7 +52,7 @@ public override bool DetectAnimation(Stream stream)
 			{
 
 				var br = new BinaryReader(stream);
-				while (true)
+				while (!stream.IsEOF())
 				{
 					byte b = br.ReadByte();
 					switch (b)
@@ -153,7 +153,7 @@ public override void Load(Stream fs, CharacterDocument document, CharacterHandle
 				var ce = new CanvasElement(32, 7);
 				p = rClip.Location;
 				var args = new WaitEventArgs();
-				while (true)
+				while (!fs.IsEOF())
 				{
 					document.OnWait(args);
 					if (args.Exit)

diff --git a/Source/Pablo/Formats/Character/Types/CtrlA.cs b/Source/Pablo/Formats/Character/Types/CtrlA.cs
@@ -167,7 +167,7 @@ public void Load (Stream stream, CharacterDocument doc, Handler handler)
 				p = rClip.Location;
 				attr = CanvasElement.Default.Attribute;
 				try {
-					while (true) {
+					while (!stream.IsEOF()) {
 						var b = br.ReadByte ();
 
 						if (b == 1) {

diff --git a/Source/Pablo/Formats/Character/Types/Tundra.cs b/Source/Pablo/Formats/Character/Types/Tundra.cs
@@ -186,7 +186,7 @@ protected static Point Load(Stream stream, Canvas canvas, Palette pal)
 			{
 				var br = new BinaryReader(stream);
 				var attr = new Attribute(0, 0);
-				while (true)
+				while (!stream.IsEOF())
 				{
 					var command = br.ReadByte();
 

diff --git a/Source/Pablo/Formats/Pix/FormatPix.cs b/Source/Pablo/Formats/Pix/FormatPix.cs
@@ -35,7 +35,7 @@ public override void Load(Stream fs, Document document)
 
 			try
 			{
-				while (true)
+				while (!fs.IsEOF())
 				{
 					b = br.ReadByte();
 					switch ((char)b)

diff --git a/Source/Pablo/Formats/Rip/FormatRip.cs b/Source/Pablo/Formats/Rip/FormatRip.cs
@@ -57,7 +57,7 @@ public void Load (Stream stream, RipDocument document, RipHandler handler)
 
 			try {
 				var args = new WaitEventArgs ();
-				while (true) {
+				while (!stream.IsEOF()) {
 					if (document.AnimateView) {
 						document.OnWait (args);
 						if (args.Exit)

diff --git a/Source/Pablo/Formats/Rip/LidgrenExtensions.cs b/Source/Pablo/Formats/Rip/LidgrenExtensions.cs
@@ -34,7 +34,7 @@ public static void ReadCommands (this NetIncomingMessage message, RipDocument do
 			var stream = message.ReadStream ();
 			var reader = new BinaryReader (stream);
 			try {
-				while (true) {
+				while (!stream.IsEOF()) {
 					char b = (char)reader.ReadRipByte ();
 					if (b == '|') {
 

diff --git a/Source/Pablo/StreamExtensions.cs b/Source/Pablo/StreamExtensions.cs
@@ -0,0 +1,15 @@
+using System.IO;
+
+namespace Pablo
+{
+	static class StreamExtensions
+	{
+		public static bool IsEOF(this Stream stream)
+		{
+			if (!stream.CanSeek)
+				return false;
+			return stream.Position >= stream.Length;
+		}
+	}
+}
+