segafilm: Fix potential division by 0 on corrupted segafilm streams in the demuxer.

Laurent Aimar committed 15 years ago

Commit c58d45e1 parent 7cbe0251 file · +9 −6Browse files

Unified · Split

         film->audio_bits = scratch[22];
         if (scratch[23] == 2)
             film->audio_type = CODEC_ID_ADPCM_ADX;
-        else if (film->audio_bits == 8)
+        else if (film->audio_channels > 0) {
-            film->audio_type = CODEC_ID_PCM_S8;
+            if (film->audio_bits == 8)
-        else if (film->audio_bits == 16)
+                film->audio_type = CODEC_ID_PCM_S8;
-            film->audio_type = CODEC_ID_PCM_S16BE;
+            else if (film->audio_bits == 16)
-        else
+                film->audio_type = CODEC_ID_PCM_S16BE;
+            else
+                film->audio_type = CODEC_ID_NONE;
+        } else
             film->audio_type = CODEC_ID_NONE;
     }
             if (film->audio_type == CODEC_ID_ADPCM_ADX)
                 audio_frame_counter += (film->sample_table[i].sample_size * 32 /
                     (18 * film->audio_channels));
-            else
+            else if (film->audio_type != CODEC_ID_NONE)
                 audio_frame_counter += (film->sample_table[i].sample_size /
                     (film->audio_channels * film->audio_bits / 8));
         } else {

Keyboard shortcuts