diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-05 17:27:45 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-05 21:37:48 +0100 |
commit | 37904d11779482f375b13da24f33f75daf13638f (patch) | |
tree | cba344230dd599b278d6fbc3f1774ea0efc425cc | |
parent | 518934b5f1db715262b7a012fe5ba0d4ea8370f3 (diff) | |
download | ffmpeg-37904d11779482f375b13da24f33f75daf13638f.tar.gz |
ffserver: Check chunk size
Fixes out of array access
Fixes: poc_ffserver.py
Found-by: Paul Cher <paulcher@icloud.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a5d25faa3f4b18dac737fdb35d0dd68eb0dc2156)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | ffserver.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c index 453d790e6c..aec808e78c 100644 --- a/ffserver.c +++ b/ffserver.c @@ -2702,8 +2702,10 @@ static int http_receive_data(HTTPContext *c) } else if (c->buffer_ptr - c->buffer >= 2 && !memcmp(c->buffer_ptr - 1, "\r\n", 2)) { c->chunk_size = strtol(c->buffer, 0, 16); - if (c->chunk_size == 0) // end of stream + if (c->chunk_size <= 0) { // end of stream or invalid chunk size + c->chunk_size = 0; goto fail; + } c->buffer_ptr = c->buffer; break; } else if (++loop_run > 10) @@ -2725,6 +2727,7 @@ static int http_receive_data(HTTPContext *c) /* end of connection : close it */ goto fail; else { + av_assert0(len <= c->chunk_size); c->chunk_size -= len; c->buffer_ptr += len; c->data_count += len; |