[gst-cvs] rbultje gst-plugins: gst-plugins/ gst-plugins/gst-libs/gst/resample/

[<rb...@fr...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins
Changes by:     rbultje
Date:           Wed Jan 05 2005  07:04:14 PST

Log message:
Reviewed by:  Ronald S. Bultje  <rb...@ro...>
* gst-libs/gst/resample/resample.c: (gst_resample_sinc_ft_s16):
Fix invalid memory access (#159211).

Modified files:
    .               : ChangeLog
    gst-libs/gst/resample: resample.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1447&r2=1.1448
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst-libs/gst/resample/resample.c.diff?r1=1.13&r2=1.14

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins/ChangeLog,v
retrieving revision 1.1447
retrieving revision 1.1448
diff -u -d -r1.1447 -r1.1448
--- ChangeLog	5 Jan 2005 14:56:26 -0000	1.1447
+++ ChangeLog	5 Jan 2005 15:04:02 -0000	1.1448
@@ -1,3 +1,10 @@
+2005-01-05  Sebastien Cote  <sc...@he...>
+
+	Reviewed by:  Ronald S. Bultje  <rb...@ro...>
+	* gst-libs/gst/resample/resample.c: (gst_resample_sinc_ft_s16):
+	  Fix invalid memory access (#159211).
 2005-01-05  Ronald S. Bultje  <rb...@ro...>
 
 	* examples/gstplay/player.c: (main):
Index: resample.c
RCS file: /cvs/gstreamer/gst-plugins/gst-libs/gst/resample/resample.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- resample.c	16 Dec 2004 11:39:00 -0000	1.13
+++ resample.c	5 Jan 2005 15:04:02 -0000	1.14
@@ -268,7 +268,8 @@
       SCALE_LOOP (o_ptr[0] = i_ptr[0], 1);
       break;
     case 2:
-      SCALE_LOOP (o_ptr[0] = i_ptr[0]; o_ptr[1] = i_ptr[1], 2);
+      SCALE_LOOP (o_ptr[0] = i_ptr[0];
+          o_ptr[1] = i_ptr[1], 2);
     default:
     {
@@ -545,6 +546,8 @@
   o_ptr = (signed short *) r->o_buf;
   center = r->o_start;
+  while (center - r->halftaps < -1 * r->filter_length)
+    center += 1.0;
   start_x = center - r->halftaps;
   start_f = floor (start_x);
   start_x -= start_f;
@@ -627,7 +630,8 @@