shithub: opus

Info  •  Files  •  Log  •  Branches

Error handling

--- a/src/opus_decoder.c

+++ b/src/opus_decoder.c

@@ -149,7 +149,7 @@

     if (audiosize > frame_size)

     {

         fprintf(stderr, "PCM buffer too small: %d vs %d (mode = %d)\n", audiosize, frame_size, mode);

-        return -1;

+        return OPUS_BAD_ARG;

     } else {

         frame_size = audiosize;

     }

@@ -315,7 +315,7 @@

 }

-int parse_size(const unsigned char *data, int len, short *size)

+static int parse_size(const unsigned char *data, int len, short *size)

 {

 	if (len<1)

 	{

@@ -411,7 +411,8 @@

 		}

 		break;

 	}

-	/* FIXME: Check if the number of samples fits in the output buffer */

+	if (count*st->frame_size > frame_size)

+		return OPUS_BAD_ARG;

 	nb_samples=0;

 	for (i=0;i<count;i++)

 	{