diff --git a/ChangeLog b/ChangeLog
index 472c0ae9fc..ed2a8b162d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-19  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/alsa/gstalsasink.c: (gst_alsa_sink_loop):
+	  Safety guard.
+
 2005-01-19  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* gst/avi/gstavimux.c: (gst_avimux_write_tag):
diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c
index 01154b6293..21b11efab9 100644
--- a/ext/alsa/gstalsasink.c
+++ b/ext/alsa/gstalsasink.c
@@ -447,7 +447,7 @@ sink_restart:
           int width = snd_pcm_format_physical_width (this->format->format);
           int size = samples * width / 8;
 
-          if (size / (width / 8) != samples) {
+          if (size / (width / 8) != samples || samples > max_discont) {
             GST_WARNING_OBJECT (this,
                 "Integer overflow for size=%d/samples=%d - broken stream",
                 size, samples);