* grub-core/lib/libgcrypt/mpi/mpih-div.c (_gcry_mpih_divrem):

	Use grub_fatal rather than divide by zero.
	* grub-core/lib/libgcrypt/mpi/mpi-pow.c (gcry_mpi_powm): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 4a17bec950af1b331fb8c153a8ad90cfd5551cfe..92a069387da9405be45b140bd28260bb3ac11a89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/libgcrypt/mpi/mpih-div.c (_gcry_mpih_divrem):
+       Use grub_fatal rather than divide by zero.
+       * grub-core/lib/libgcrypt/mpi/mpi-pow.c (gcry_mpi_powm): Likewise.
+
 2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/gui.h (grub_fixed_sfs_divide): Round rather than

diff --git a/grub-core/lib/libgcrypt/mpi/mpi-pow.c b/grub-core/lib/libgcrypt/mpi/mpi-pow.c
index a63fc6dd4e11e59c07b7ab08b422d30fb2bb59bf..58643fed2eac2e8fc78ec18d008096dad078bb78 100644 (file)
--- a/grub-core/lib/libgcrypt/mpi/mpi-pow.c
+++ b/grub-core/lib/libgcrypt/mpi/mpi-pow.c
@@ -77,7 +77,7 @@ gcry_mpi_powm (gcry_mpi_t res,
   ep = expo->d;
 
   if (!msize)
-    msize = 1 / msize;     /* Provoke a signal.  */
+    grub_fatal ("mpi division by zero");
 
   if (!esize)
     {

diff --git a/grub-core/lib/libgcrypt/mpi/mpih-div.c b/grub-core/lib/libgcrypt/mpi/mpih-div.c
index 224b8108672e101722c01078df25c5cba2200d6a..0b458fffdd9fb022efc016bb4f3c5fcdf4ea9dca 100644 (file)
--- a/grub-core/lib/libgcrypt/mpi/mpih-div.c
+++ b/grub-core/lib/libgcrypt/mpi/mpih-div.c
@@ -214,7 +214,8 @@ _gcry_mpih_divrem( mpi_ptr_t qp, mpi_size_t qextra_limbs,
       case 0:
        /* We are asked to divide by zero, so go ahead and do it!  (To make
           the compiler not remove this statement, return the value.)  */
-       return 1 / dsize;
+       grub_fatal ("mpi division by zero");
+       return 0;
 
       case 1:
        {