rtc_get_time_ms.c (grub_rtc_get_time_ms): Avoid division by zero.

diff --git a/ChangeLog b/ChangeLog
index 03769742ca8c2df52fd4d863f85998a7deb88916..40ced5a485d5fe7029ab2a33d43654bb888f10c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/generic/rtc_get_time_ms.c (grub_rtc_get_time_ms): Avoid
+       division by zero.
+
 2015-01-20  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/loader/i386/xnu.c (guessfsb): Avoid division by 0.

diff --git a/grub-core/kern/generic/rtc_get_time_ms.c b/grub-core/kern/generic/rtc_get_time_ms.c
index 49f2acac958025265654fc0dc34fa85f07ee0570..3e39c8fe19743c887567df981ef6c4dd0792c641 100644 (file)
--- a/grub-core/kern/generic/rtc_get_time_ms.c
+++ b/grub-core/kern/generic/rtc_get_time_ms.c
@@ -34,5 +34,5 @@ grub_rtc_get_time_ms (void)
         1 s          1        T rtc ticks
    */
   grub_uint64_t ticks_ms_per_sec = ((grub_uint64_t) 1000) * grub_get_rtc ();
-  return grub_divmod64 (ticks_ms_per_sec, GRUB_TICKS_PER_SECOND, 0);
+  return grub_divmod64 (ticks_ms_per_sec, GRUB_TICKS_PER_SECOND ? : 1000, 0);
 }