* src/audio_output/mixer.c: fixed segfault.

9b52a805 · Gildas Bazin · dbc6f2fb · 9b52a805
Commit 9b52a805 authored Oct 18, 2004 by Gildas Bazin
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/audio_output/mixer.c src/audio_output/mixer.c +4 -2

No files found.
--- a/src/audio_output/mixer.c
+++ b/src/audio_output/mixer.c
@@ -274,8 +274,10 @@ static int MixBuffer( aout_instance_t * p_aout )
                /* Round to the nearest multiple */
                i_nb_bytes /= p_aout->mixer.mixer.i_bytes_per_frame;
                i_nb_bytes *= p_aout->mixer.mixer.i_bytes_per_frame;
-                p_input->p_first_byte_to_mix = p_buffer->p_buffer
-                                                + i_nb_bytes;
+
+                if( i_nb_bytes < 0 ) break; /* FIXME: reset state properly */
+
+                p_input->p_first_byte_to_mix = p_buffer->p_buffer + i_nb_bytes;
            }
        }
    }