From 57b01250046a33900d3e4b7434967aacb343bc7e Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 9 Nov 2011 14:47:45 +0100
Subject: [PATCH] 	* include/grub/misc.h (grub_strncat): Fix the order of
 conditionals to 	avoid accessing beyond the array.

---
 ChangeLog           | 5 +++++
 include/grub/misc.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1b7fd4411..352c69c4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/misc.h (grub_strncat): Fix the order of conditionals to
+	avoid accessing beyond the array.
+
 2011-11-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* configure.ac: Add missing -mXX to TARGET_CPPFLAGS.
diff --git a/include/grub/misc.h b/include/grub/misc.h
index 5bc159e7d..4e7d9077c 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -87,7 +87,7 @@ grub_strncat (char *dest, const char *src, int c)
   while (*p)
     p++;
 
-  while ((*p = *src) != '\0' && c--)
+  while (c-- && (*p = *src) != '\0')
     {
       p++;
       src++;