aboutsummaryrefslogtreecommitdiffstats
path: root/com32/mboot
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-11-05 17:52:47 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-11-06 15:57:15 -0800
commit8492da661cc77e26cd18e4cf307b78e50661ea29 (patch)
treed3d19f6c48eef6e6b44982f3d8b2fa993edfe16c /com32/mboot
parentebef1cd107b7034056309bf49f92a2b9e92b9fe0 (diff)
parent259c0dca1bc6ead6003fc504e136be67a1311abb (diff)
downloadsyslinux-8492da661cc77e26cd18e4cf307b78e50661ea29.tar.gz
syslinux-8492da661cc77e26cd18e4cf307b78e50661ea29.tar.xz
syslinux-8492da661cc77e26cd18e4cf307b78e50661ea29.zip
Merge branch 'master' into fsc
Conflicts: com32/modules/Makefile core/pxelinux.asm core/serirq.inc Note: hardwired options will need to be re-implemented in PXELINUX. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/mboot')
-rw-r--r--com32/mboot/map.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/mboot/map.c b/com32/mboot/map.c
index 1a788ef7..887776fe 100644
--- a/com32/mboot/map.c
+++ b/com32/mboot/map.c
@@ -127,7 +127,7 @@ int map_image(void *ptr, size_t len)
else
mbh_len = 12;
- if (i + mbh_len < len)
+ if (i + mbh_len > len)
mbh_len = 0; /* Invalid... */
else
break; /* Found something... */