2006-03-21 Yoshinori K. Okuji <okuji@enbug.org>

        * stage2/builtins.c (setup_func): Specify the size of DEVICE to
        grub_strncat instead of a strange number 256. Reported by Vitaly
        Fertman <vitaly@namesys.com>.

diff --git a/ChangeLog b/ChangeLog
index 0beaa35adb4ecdb1d2fe2fe0b064bdba1db8bc69..3fd2dad253472f6844f85ec29838d926e23f167d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-21  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * stage2/builtins.c (setup_func): Specify the size of DEVICE to
+       grub_strncat instead of a strange number 256. Reported by Vitaly
+       Fertman <vitaly@namesys.com>.
+
 2005-09-29  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * docs/multiboot.texi: Fix a bug in the byte order of

diff --git a/THANKS b/THANKS
index 853da1a5ec8369470c9c1ea62088dfabd28f6c94..03d34d41155b56e731c410e055d6cafff132fff7 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -121,3 +121,4 @@ Vesa Jaaskelainen <jaaskela@tietomyrsky.fi>
 Yedidyah Bar-David <didi@post.tau.ac.il>
 Yury V. Umanets <umka@namesys.com>
 Yuri Zaporogets <yuriz@ukr.net>
+Vitaly Fertman <vitaly@namesys.com>

diff --git a/stage2/builtins.c b/stage2/builtins.c
index 3e08a8632c3eb9f0c7994de8d29811782dcdd919..0d92bec28bd2bbf5e7ae0f107f87fd7d5c52abbc 100644 (file)
--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -3830,15 +3830,15 @@ setup_func (char *arg, int flags)
        {
          char tmp[16];
          grub_sprintf (tmp, ",%d", (partition >> 16) & 0xFF);
-         grub_strncat (device, tmp, 256);
+         grub_strncat (device, tmp, sizeof (device));
        }
       if ((partition & 0x00FF00) != 0x00FF00)
        {
          char tmp[16];
          grub_sprintf (tmp, ",%c", 'a' + ((partition >> 8) & 0xFF));
-         grub_strncat (device, tmp, 256);
+         grub_strncat (device, tmp, sizeof (device));
        }
-      grub_strncat (device, ")", 256);
+      grub_strncat (device, ")", sizeof (device));
     }
   
   int embed_stage1_5 (char *stage1_5, int drive, int partition)