diff mbox

[FFmpeg-devel,10/10] ffserver.c: Fix invalid read if resource is empty string

Message ID 20180528182711.3221-11-klaxa1337@googlemail.com
State New
Headers show

Commit Message

Stephan Holljes May 28, 2018, 6:27 p.m. UTC 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
---
 ffserver.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/ffserver.c b/ffserver.c
index 65b12da..cdcc064 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -350,8 +350,9 @@  void *accept_thread(void *arg)
         ifmt_ctx = NULL;
         for (i = 0; i < config->nb_streams; i++) {
             stream_name = info->pubs[i]->stream_name;
-            //       skip leading '/'  ---v
-            if(!strncmp(client->resource + 1, stream_name, strlen(stream_name))) {
+            //           skip leading '/'  ---v
+            if(client->resource && strlen(client->resource)
+                && !strncmp(client->resource + 1, stream_name, strlen(stream_name))) {
                 pub = info->pubs[i];
                 ifmt_ctx = info->ifmt_ctxs[i];
                 break;