From 59fffaf3cdd31afa1d7b33a618797e1821b14806 Mon Sep 17 00:00:00 2001
From: Sjoerd van der Berg <harekiet@users.sourceforge.net>
Date: Thu, 17 Jun 2004 17:40:02 +0000
Subject: [PATCH] Only use the pages in file entry from the exe header to
 determine size to load

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1837
---
 src/dos/dos_execute.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/dos/dos_execute.cpp b/src/dos/dos_execute.cpp
index 3352fdc7..54885eb6 100644
--- a/src/dos/dos_execute.cpp
+++ b/src/dos/dos_execute.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: dos_execute.cpp,v 1.39 2004-05-04 18:34:08 qbix79 Exp $ */
+/* $Id: dos_execute.cpp,v 1.40 2004-06-17 17:40:02 harekiet Exp $ */
 
 #include <string.h>
 #include <ctype.h>
@@ -252,14 +252,8 @@ bool DOS_Execute(char * name,PhysPt block_pt,Bit8u flags) {
 	if (len<sizeof(EXE_Header)) iscom=true;	
 	if ((head.signature!=MAGIC1) && (head.signature!=MAGIC2)) iscom=true;
 	else {
-		headersize=head.headersize*16;
-		if (head.extrabytes) {
-			imagesize  = (head.pages-1)*512-headersize; 
-			imagesize += head.extrabytes % 512;
-		} else
-			imagesize  = head.pages*512-headersize; 
-
-		// always load st least 512 Bytes (dos cache/dos bug?)
+		headersize = head.headersize*16;
+		imagesize = head.pages*512-headersize; 
 		if (imagesize+headersize<512) imagesize = 512-headersize;
 	}
 	if (flags!=OVERLAY) {