Changeset 638:f7cdb2c9bb59 in roaraudio

Timestamp:

08/21/08 18:26:35 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

in error case we should cancel playback as errors may/will result in buffer overflow!

File:

• roard/codecfilter_celt.c (modified) (3 diffs)

roard/codecfilter_celt.c

@@ -147 +147 @@
 
   if ( fs > self->s_buf )
-   break;
+   return -1;
 
   if ( stream_vio_s_read(self->stream, self->ibuf, fs) != fs )
-   break;
+   return -1;
 
   cbuf = buf + r;
@@ -156 +156 @@
 //  printf("buf=%p, r=%i // cbuf=%p\n", buf, r, cbuf);
   if ( celt_decode(self->decoder, (unsigned char *) self->ibuf, fs, (celt_int16_t *) cbuf) < 0 )
-   break;
+   return -1;
 
   r += self->s_buf;
@@ -166 +166 @@
    fs = ROAR_NET2HOST16(fs);
 //   printf("next: fs=%i\n", fs);
+   if ( fs > self->s_buf )
+    return -1;
    if ( stream_vio_s_read(self->stream, self->ibuf, fs) == fs ) {
 //    printf("got data!\n");