From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 20 Oct 2013 16:42:40 +0000 (+0200)
Subject: 	* grub-core/fs/zfs.c: Remove variable length arrays.
X-Git-Tag: grub-2.02-beta1~614
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3e393411bdb97705480516c3c003bb8040e4fbb;p=thirdparty%2Fgrub.git

	* grub-core/fs/zfs.c: Remove variable length arrays.
	Reduces zfs.mod by 160 bytes (208 compressed).
---

diff --git a/ChangeLog b/ChangeLog
index f1e3ab9a7..fd8cd931f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/zfs.c: Remove variable length arrays.
+	Reduces zfs.mod by 160 bytes (208 compressed).
+
 2013-10-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/zfs/zfs.c (check_pool_label): Fix memory leak.
diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
index 23603affe..37df3d5b7 100644
--- a/grub-core/fs/zfs/zfs.c
+++ b/grub-core/fs/zfs/zfs.c
@@ -1302,7 +1302,9 @@ gf_mul (grub_uint8_t a, grub_uint8_t b)
   return powx[powx_inv[a] + powx_inv[b]];
 }
 
-static inline grub_err_t
+#define MAX_NBUFS 4
+
+static grub_err_t
 recovery (grub_uint8_t *bufs[4], grub_size_t s, const int nbufs,
 	  const unsigned *powers,
 	  const int *idx)
@@ -1356,9 +1358,9 @@ recovery (grub_uint8_t *bufs[4], grub_size_t s, const int nbufs,
 	return GRUB_ERR_NONE;
       }
       /* Otherwise use Gauss.  */
-    default:
+    case 3:
       {
-	grub_uint8_t matrix1[nbufs][nbufs], matrix2[nbufs][nbufs];
+	grub_uint8_t matrix1[MAX_NBUFS][MAX_NBUFS], matrix2[MAX_NBUFS][MAX_NBUFS];
 	int i, j, k;
 
 	for (i = 0; i < nbufs; i++)
@@ -1426,7 +1428,7 @@ recovery (grub_uint8_t *bufs[4], grub_size_t s, const int nbufs,
 
 	for (i = 0; i < (int) s; i++)
 	  {
-	    grub_uint8_t b[nbufs];
+	    grub_uint8_t b[MAX_NBUFS];
 	    for (j = 0; j < nbufs; j++)
 	      b[j] = bufs[j][i];
 	    for (j = 0; j < nbufs; j++)
@@ -1438,6 +1440,8 @@ recovery (grub_uint8_t *bufs[4], grub_size_t s, const int nbufs,
 	  }
 	return GRUB_ERR_NONE;
       }
+    default:
+      return grub_error (GRUB_ERR_BUG, "too big matrix");
     }      
 }