Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/speex.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon <ron@debian.org>2013-12-06 10:10:41 +0400
committerTristan Matthews <le.businessman@gmail.com>2013-12-06 10:10:41 +0400
commit9e349c1df606678cd496957da139d64eca079da3 (patch)
tree478ea6ec4f56548dab3d7e6ef3adc0440aaebaa2
parentca7cfdbf44f4b0df30895ec4e8479393416488ff (diff)
Check the size of the header packet before we look inside it
Signed-off-by: Tristan Matthews <le.businessman@gmail.com>
-rw-r--r--libspeex/speex_header.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/libspeex/speex_header.c b/libspeex/speex_header.c
index 979fc9f..5d6bb04 100644
--- a/libspeex/speex_header.c
+++ b/libspeex/speex_header.c
@@ -147,20 +147,22 @@ EXPORT SpeexHeader *speex_packet_to_header(char *packet, int size)
int i;
SpeexHeader *le_header;
const char *h = "Speex ";
- for (i=0;i<8;i++)
- if (packet[i]!=h[i])
- {
- speex_notify("This doesn't look like a Speex file");
- return NULL;
- }
-
+
/*FIXME: Do we allow larger headers?*/
if (size < (int)sizeof(SpeexHeader))
{
speex_notify("Speex header too small");
return NULL;
}
-
+
+
+ for (i=0;i<8;i++)
+ if (packet[i]!=h[i])
+ {
+ speex_notify("This doesn't look like a Speex file");
+ return NULL;
+ }
+
le_header = (SpeexHeader*)speex_alloc(sizeof(SpeexHeader));
SPEEX_COPY(le_header, (SpeexHeader*)packet, 1);