Changeset 287 for pjproject/trunk/pjmedia/src/pjmedia/resample.c

Timestamp:

Mar 5, 2006 1:33:57 PM (18 years ago)

Author:

bennylp

Message:

Fixed bug where resample may write pass the output buffer

File:

• pjproject/trunk/pjmedia/src/pjmedia/resample.c (modified) (7 diffs)

pjproject/trunk/pjmedia/src/pjmedia/resample.c

@@ -39 +39 @@
  *  - move stddefs.h and resample.h to this file.
  *  - const correctness.
+ *  - fixed SrcLinear() may write pass output buffer.
+ *  - assume the same for SrcUp() and SrcUD(), so put the same
+ *    protection.
  */
 #include <pjmedia/resample.h>
@@ -204 +207 @@
     UWORD time = 0;
     const HWORD *xp;
-    HWORD *Ystart;
+    HWORD *Ystart, *Yend;
     WORD v,x1,x2;
     
@@ -215 +218 @@
     
     Ystart = Y;
+    Yend = Ystart + (unsigned)(nx * pFactor);
     endTime = time + (1<<Np)*(WORD)nx;
-    while (time < endTime)
+    while (time < endTime && Y < Yend)  /* bennylp fix: added Y < Yend */
     {
         iconst = (time) & Pmask;
@@ -341 +345 @@
 {
     const HWORD *xp;
-    HWORD *Ystart;
+    HWORD *Ystart, *Yend;
     WORD v;
     
@@ -353 +357 @@
     
     Ystart = Y;
+    Yend = Ystart + (unsigned)(nx * pFactor);
     endTime = time + (1<<Np)*(WORD)nx;
-    while (time < endTime)
+    while (time < endTime && Y < Yend)  /* bennylp fix: protect Y */
     {
         xp = &X[time>>Np];      /* Ptr to current input sample */
@@ -380 +385 @@
 {
     const HWORD *xp;
-    HWORD *Ystart;
+    HWORD *Ystart, *Yend;
     WORD v;
     
@@ -396 +401 @@
     
     Ystart = Y;
+    Yend = Ystart + (unsigned)(nx * pFactor);
     endTime = time + (1<<Np)*(WORD)nx;
-    while (time < endTime)
+    while (time < endTime && Y < Yend) /* bennylp fix: protect Y */
     {
         xp = &X[time>>Np];      /* Ptr to current input sample */