コミット: 2bf8c9431e7d7b17dbcc252deee80bedbef724a6 - timidity41 (git)

コミットメタ情報

• リビジョン: 2bf8c9431e7d7b17dbcc252deee80bedbef724a6 (tree)
• 日時: 2014-08-21 11:01:54
• 作者: yta <yta@inte...>
• コミッター: TAMUKI Shoichi

ログメッセージ

Fix reverb buffer-overrun issue

Add code to check the upper limit of the index. TiMidity++ to buffer-
overrun when the value of the reverb_status_gs.character was a 6 or 7.
info->index is set to a value out of range when the value of the
"Reverb Time" was -64.

Signed-off-by: yta <[e-mail]>

変更サマリ

• modified: timidity/reverb.c

差分

--- a/timidity/reverb.c
+++ b/timidity/reverb.c
@@ -1600,6 +1600,9 @@ static void init_ch_reverb_delay(InfoDelay3 *info)
 	set_delay(&(info->delayL), x);
 	set_delay(&(info->delayR), x);
 	info->index[0] = x - info->size[0];
+	if (info->index[0] >= info->size[0]) {
+		info->index[0] = (info->size[0] == 0) ? 0 : info->size[0] - 1;
+	}
 	info->level[0] = (double)reverb_status_gs.level * 1.82 / 127.0;
 	info->feedback = sqrt((double)reverb_status_gs.delay_feedback / 127.0) * 0.98;
 	info->leveli[0] = TIM_FSCALE(info->level[0], 24);