From patchwork Tue May 14 04:15:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13101 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C4F76449B2B for ; Tue, 14 May 2019 07:16:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A4B586806DC; Tue, 14 May 2019 07:16:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4925C6802AC for ; Tue, 14 May 2019 07:16:45 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id w8so15045124wrl.6 for ; Mon, 13 May 2019 21:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SZNUU6kqchG8wd0SL6G3V05O/yOGI2FFNo5gSmzyn40=; b=IQhpYU3CbjLTCnZIWAmGJWToOVEZjcBGUgetjS8mb1Slke3Fnlhqnyj0Fsdrb1u9+I gUxgU1t4/6TT9kWPZOIE/cFB/jxmpBilSYT1bNBkg7w9vf6Cc2Sd4oRhMpVSa2qZXgGZ VYD+ygLmQEmnGZKXF187vkavf0uGyD3maoQJuqyw9c/X/cRUXYbTQ0Ky5Ch9wKeL7v5F N8EDxfq/VPO2YH1ZkE9FKk2t4O6eAHbTbq394OGvvOtcEg8ClETXAFlNS1rJanNeBHI4 09+c+UGgt92zUkzuk43UkXcZxqaOUNlKdbQ6UqSenv7zMFGMEbsrqC/JvVEoYj0+7+W7 isyg== 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:mime-version :content-transfer-encoding; bh=SZNUU6kqchG8wd0SL6G3V05O/yOGI2FFNo5gSmzyn40=; b=DmAXxG6o4fvdZmRJM6OSBq9Zu733KXQJHJB+dk07CXv5m2b40fGMw+hIF30yIoZqoH 2IOzWyBfguCL/TO4gTnpTjciV4KOBx7ByyfEG3/AJxJ27cK3MCeCynvoEQHMeDviLbpl 2JFlfmkCeensy2nLLYowyeiOOfnEF2oeD2HWCnpKblYr/eZByJygn9xgXZtpiFZJYn9f aSKPJaMiGVmtCnDsYrI7t8S+c0Zt3L6JEeEsDMQiC5n31WWKi2m3k1OMvHrjFYyguNNk LBn2a1HiyxC/JlvJQD48+pKmQOGWJT28yW7hiZSb7Zx9Ye63Nz/KNj3ujEH4R2KjxweM t2Uw== X-Gm-Message-State: APjAAAVhrzav9PSrBp2/e3VZaEC1mXSj5VrprL68WbvuTkSeweC3IRKS VdjNZ/Wi41A/1iL+6XiUu7aSRSuz X-Google-Smtp-Source: APXvYqw68zGj8wavm91DGfuH+qD1qzyZQ6+psnGmrLOglsd4uAz0NsmbUMmNmdLY/WcKrase29woVA== X-Received: by 2002:adf:f6cb:: with SMTP id y11mr21014916wrp.67.1557807404582; Mon, 13 May 2019 21:16:44 -0700 (PDT) Received: from localhost.localdomain (ipbcc18715.dynamic.kabel-deutschland.de. [188.193.135.21]) by smtp.gmail.com with ESMTPSA id n4sm3140304wmb.22.2019.05.13.21.16.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 May 2019 21:16:43 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 May 2019 06:15:17 +0200 Message-Id: <20190514041517.14116-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_stack: Don't modify const strings 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" b3b7ba62 introduced undefined behaviour: A (non-modifiable) string literal has been assigned to a modifiable string; said string was indeed modified later via av_strtok. This of course caused compiler warnings because of the discarded qualifier; these are in particular fixed by this commit. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_stack.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_stack.c b/libavfilter/vf_stack.c index 1455f196a7..4d254e0013 100644 --- a/libavfilter/vf_stack.c +++ b/libavfilter/vf_stack.c @@ -84,9 +84,11 @@ static av_cold int init(AVFilterContext *ctx) if (!strcmp(ctx->filter->name, "xstack")) { if (!s->layout) { - if (s->nb_inputs == 2) - s->layout = "0_0|w0_0"; - else { + if (s->nb_inputs == 2) { + s->layout = av_strdup("0_0|w0_0"); + if (!s->layout) + return AVERROR(ENOMEM); + } else { av_log(ctx, AV_LOG_ERROR, "No layout specified.\n"); return AVERROR(EINVAL); }