From 08ba682d78be2b5dc1f79e53fac9aaa41db4dbdc Mon Sep 17 00:00:00 2001 From: okuji Date: Wed, 20 Oct 1999 07:50:31 +0000 Subject: [PATCH] fix the wrong checks in memcheck. --- ChangeLog | 5 +++++ docs/new-grub.texi | 2 +- stage2/char_io.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4929cf28b..dea192f01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-10-20 OKUJI Yoshinori + + * stage2/char_io.c (memcheck): Fix the checks: "<=" -> "<". + Reported by Mike Hicks . + 1999-10-19 OKUJI Yoshinori * stage2/builtins.c (find_func): New function. diff --git a/docs/new-grub.texi b/docs/new-grub.texi index 22a7af6d8..8385cddd9 100644 --- a/docs/new-grub.texi +++ b/docs/new-grub.texi @@ -100,7 +100,6 @@ Part I: The Tutorial Manual * Installation:: * Boot:: * Configuration:: -* FAQ:: Part II: The User Reference Manual @@ -125,6 +124,7 @@ Part III: The Programmer Reference Manual Appendices and Indices +* FAQ:: * Obtaining and Building GRUB:: * Reporting Bugs:: * Index:: diff --git a/stage2/char_io.c b/stage2/char_io.c index f1be1f026..f27d7eba7 100644 --- a/stage2/char_io.c +++ b/stage2/char_io.c @@ -833,9 +833,9 @@ memcheck (int addr, int len) if ((addr < RAW_ADDR (0x1000)) || (addr < RAW_ADDR (0x100000) - && RAW_ADDR (mbi.mem_lower * 1024) <= (addr + len)) + && RAW_ADDR (mbi.mem_lower * 1024) < (addr + len)) || (addr >= RAW_ADDR (0x100000) - && RAW_ADDR (mbi.mem_upper * 1024) <= ((addr - 0x100000) + len))) + && RAW_ADDR (mbi.mem_upper * 1024) < ((addr - 0x100000) + len))) errnum = ERR_WONT_FIT; return ! errnum;