From patchwork Mon May 28 18:27:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9137 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp2231891jad; Mon, 28 May 2018 11:28:49 -0700 (PDT) X-Google-Smtp-Source: AB8JxZr41CpcRHWdWllKSLH4orCp+VLZd02n/CD4MSZX+gUgLsr5l1tOOzH9MDLnjAK4b6+TueWw X-Received: by 2002:adf:9365:: with SMTP id 92-v6mr12996047wro.283.1527532129052; Mon, 28 May 2018 11:28:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527532129; cv=none; d=google.com; s=arc-20160816; b=E5Y5TEpjo+BaISXbWaeLWmnG6Vj+XDxCIY4KOI6Xmc0g+JsaKcpI2BdETmMZXF+1Ph ofNeZL0ZI83BiK2aiq32/CRLTwA7bQZYkKG8BwJPG96cqJt+aDgf7DxeNvSwEtzDKEJB Y6q8aadMGt9+NAL+P22SjqpuLJ3AGkpFjSIGdiPbL/O+A3oJX7Eln3t99bYTO2qeRemp rMpYRMYSSVfbOYnuF3MT/jK3VAe4zIYRGbrLYG8pMhbyDRXariNn8XKBzK67fdF4A2IW 6rJEobI0BDe15L8cyv80M/C8e19JNf3WSMk3se6DrNNSjXWFBYVELLz5yUy0WbQTZY0v dPlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=9iW+fynesQwjMaDJQXBrTQANbLqm73Gafy8pJP+LwFw=; b=vfZy9QbQ/QAZVgvpzBuL9Vj2sHrvErusT3sMphQyDmCbtVgkPbM182SaYK7ddsfVAK m4NJrOlHwdbMGp9F4Ye469hFTvxmpDdKTYYuweHAlL51iDrSNNUTyaWhH2zeptbIMAC1 a1/Mn8oDkJGUqvjaEpwxZNj90BoD1DcfMTg+fpU1SGIqYJpDqK4zAe2gjWfkKcvuWurW 76qjdwIPQclx7dzchVQDRTw6cuL00zYZZACiCmygegEbLjPa8gfTIWubYH4Qwd+y6d3g PaSt8Qi/mc33mN1Qfk6lDhyuYQUBFysIDN2w/lBBjtRFd9ncLv0tw4o6qpC743RwK6Lw aR8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=VFqsQVg0; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l20-v6si887691wrc.135.2018.05.28.11.28.48; Mon, 28 May 2018 11:28:49 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=VFqsQVg0; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D6D368A3D6; Mon, 28 May 2018 21:26:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34AF568A3CD for ; Mon, 28 May 2018 21:26:49 +0300 (EEST) Received: by mail-wm0-f41.google.com with SMTP id t11-v6so34210865wmt.0 for ; Mon, 28 May 2018 11:27:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KBt0r0SD1ZWWanR1TqmfAeThXDIuoWOXucUPfyJwYT4=; b=VFqsQVg03PZX7j8qLypi7PExIQhh6O5sJuhw6NXszkqnehjISpciIySm6pW4hEPLoF pnZk/Qn0ZzaX3ev4N/8MHwWmcWoA9sEQEMmT6ZMXTVqyZHzcZXdrDIao4EgYR1MSxhsa l6Yht4ix3pD4bV2CxjXtWJxmrsj2G6s5+6deehZzHFyxdB5ayuiW9W326FY41YObcPhH rm2JlTTBVnWmfuD3k4ArXq2Div7JiClsqsUJysDWIo8mgkU4v8CIIRXcBnby9B5oCbky 7lNL45ORMYS4FZq6AbL2xXO6CKDnyWLqxsqvqHlBh5TjR1Rd3SPSxyhE0bPy5Ijt28H5 f70Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KBt0r0SD1ZWWanR1TqmfAeThXDIuoWOXucUPfyJwYT4=; b=nzHlIznNfYhUu0itMr6uTSV2t7nlp1BkhW4HPZHNZl6lBLyD5s+9kZyqbZ3MGBVvyK 3ilnlexsjjEYB03AWQINrgEzIeDfDomJtYiJzK/NQvZAuyeHThyMbzV+uxUJP06ivHj9 /i6viKliYfWfYsR90Y400Y6kV39lFwiRLmbpCy9kFraNvP2hy1PqAgNqhkcNMkrPSL0s 7WSf5RRcXoYxRtpCUXcP5NT1XFc5mjLGBGdX8ONzBuqVjt18NWpjjhGAO5SrcKJgub+w dVhQHSalQqt/9uio1p/x2VJxW9TMQEl/RCHcnebDnRMCF/xfcYu82yA858xefsFCpvUp votw== X-Gm-Message-State: ALKqPwdpYm0+vAYqqMiH0Q7zXLegxX3rCksi4FnR8w+W0qm5WZzvO18z jBxHYLBeXK3V3KnrUtLlVlbi6A== X-Received: by 2002:a1c:8a03:: with SMTP id m3-v6mr8424967wmd.135.1527532052410; Mon, 28 May 2018 11:27:32 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id g205-v6sm4126285wmg.43.2018.05.28.11.27.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 11:27:31 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 May 2018 20:27:11 +0200 Message-Id: <20180528182711.3221-11-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180528182711.3221-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 10/10] ffserver.c: Fix invalid read if resource is empty string X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- ffserver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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;