From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 11 Apr 2011 05:51:15 +0000 (+0200)
Subject: Fix filename comparison
X-Git-Tag: 1.99~64^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=228f95a2502a35a5a2e9a8a8eab0e66fa2c515ad;p=thirdparty%2Fgrub.git

Fix filename comparison
---

diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index fb7469b67..add590dfb 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -1103,12 +1103,9 @@ find_path (struct grub_btrfs_data *data,
 			      + grub_le_to_cpu16 (cdirel->n)
 			      + grub_le_to_cpu16 (cdirel->m)))
 	{
-	  char c;
-	  c = cdirel->name[grub_le_to_cpu16 (cdirel->n)];
-	  cdirel->name[grub_le_to_cpu16 (cdirel->n)] = 0;
-	  if (grub_strncmp (cdirel->name, ctoken, ctokenlen) == 0)
+	  if (ctokenlen == grub_le_to_cpu16 (cdirel->n)
+	      && grub_memcmp (cdirel->name, ctoken, ctokenlen) == 0)
 	    break;
-	  cdirel->name[grub_le_to_cpu16 (cdirel->n)] = c;
 	}
       if ((grub_uint8_t *) cdirel - (grub_uint8_t *) direl
 	  >= (grub_ssize_t) elemsize)