assert that audio date divider is non-nul, refs #2169

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index ef165fb773a81bd26e233c50c9485b2a98c73199..f8dc727cd759a02bef34d99f880b2cee590a6c8c 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -479,6 +479,7 @@ void aout_FifoDestroy( aout_instance_t * p_aout, aout_fifo_t * p_fifo )
  *****************************************************************************/
 void aout_DateInit( audio_date_t * p_date, uint32_t i_divider )
 {
+    assert (i_divider);
     p_date->date = 0;
     p_date->i_divider = i_divider;
     p_date->i_remainder = 0;
@@ -515,7 +516,8 @@ mtime_t aout_DateGet( const audio_date_t * p_date )
  *****************************************************************************/
 mtime_t aout_DateIncrement( audio_date_t * p_date, uint32_t i_nb_samples )
 {
-    mtime_t i_dividend = (mtime_t)i_nb_samples * 1000000;
+    mtime_t i_dividend = INT64_C(1000000) * i_nb_samples;
+    assert (p_date->i_divider); /* uninitialized audio_data_t ? */
     p_date->date += i_dividend / p_date->i_divider;
     p_date->i_remainder += (int)(i_dividend % p_date->i_divider);
     if ( p_date->i_remainder >= p_date->i_divider )