From patchwork Thu Nov 23 15:31:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 44765 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp661651pzb; Thu, 23 Nov 2023 07:32:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IHXXhztaRRgQK5iBmhTf0mZ3X6Dvzfd+ifMOaPh7Xt26MRs4THa6fVdgpSwy4qnlb3My3mT X-Received: by 2002:a17:906:4750:b0:9e4:a597:ffe with SMTP id j16-20020a170906475000b009e4a5970ffemr2645410ejs.44.1700753533044; Thu, 23 Nov 2023 07:32:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700753533; cv=none; d=google.com; s=arc-20160816; b=wndq2CxLVu/ymEzk5K26h+9VpMbsMqf6bshjuAR+VG2TYLkkYi9lcO4zyD3ct/IXit kUQoifIVpaXdes3H+/n/WfWPxRQ2j1TqGc0YmLZjggPHSjJZOZot2jsLEgraSJgCnYmN DDgjdOyXUbtJ4ZsRtXtBD+JwOUhYSH1qV+JwXBmCZRI6Pa0p4VhtUOliXN2ckj80+33I HA82A1+4vg8tYyaqeLn9H79ccepQ1wfgNcPaOGzZb6b0HZAQwDD5Q2a86Zff5ftrv1wG I0BcFkF0CeoEZ3vDPMuWBKW27VIMqO5RpAF9jbOB8NZDxxfRty98+cbj90j84ZfqEnoP WYfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Y8zB80+4Rp12FTV5JGBTCf2Deu5gRrRSWq0885BMrcE=; fh=+bdjGe20eEUjtjncwA1dnEEVYNfJL4vyhV+sIRR4l+g=; b=bcTDCu5ED+vpKU72dNOkpmULGYXIT4NkoM7WBkxgUeGIjpXER4tenGi3Zbtm13Tha2 J6RlC1O6oDAm0gH6jOukocDvejUtgnyjwFYa/xdvxpvIbsct1yJNZvMccZMhFgDDytXj VhRAe/fb5gDCUTS9OpAob+mQSQyTseCV2Ld4qD+LgDCjsE6O/0r1aup3JUSnXscUZOMj MlWs3lTKQJDM2xjlLSCim9ebiAMkT/2xVV+pKUKlUZRzQ0lPYk/jQNdC7Ja/QQzZ4xmH wLpYzrOGpdyEomn4hWSKB8fNh8TUJy7p7NMm1fkcH8lATVjQdLPCHDPtrarisQdX3NBU 6KQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=S8G26qr+; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c18-20020a17090603d200b009ffcfc08d7esi754034eja.303.2023.11.23.07.32.12; Thu, 23 Nov 2023 07:32:13 -0800 (PST) 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=@gmail.com header.s=20230601 header.b=S8G26qr+; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BDCAD68CED5; Thu, 23 Nov 2023 17:32:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f51.google.com (mail-oa1-f51.google.com [209.85.160.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E63B768C7F0 for ; Thu, 23 Nov 2023 17:32:02 +0200 (EET) Received: by mail-oa1-f51.google.com with SMTP id 586e51a60fabf-1f5ccc1ca61so233616fac.0 for ; Thu, 23 Nov 2023 07:32:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700753521; x=1701358321; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=E1GbrSaAWhHMIoB2biqP5nbwf/gijfBCgD8Wt0mKs+Q=; b=S8G26qr+3d6uQw66TG4BxESHhKLnWd3jhpRP/5FDwJGm0OkEFXFytK/yFJ6IdXZ591 FY6/QijSbs5E7sY/S+8VOEiQiSR5kOwZ6TeMqx/RBP/qJmn687jF7PLy7XMiFywbcqyH eYGQKNh/K2SCPu0jfyHDGcCT1qDCMUcNZqeoXL+bSuIX3poYyogc9T/cNDLruCqBrB10 Vl/lC2P/E4QhzpMFF4OJLhsiRqFA1UNyZWY21vr8ZYNlk7sGoW3wpbU1SzJ0ZYsU+0Ym PuUU0dDjDxCG9wgqGm2o+JKQ57AwrwBBkAfBtU4PZc96nKxN3OqdSAkiAqXpzSLilcpv 88Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700753521; x=1701358321; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=E1GbrSaAWhHMIoB2biqP5nbwf/gijfBCgD8Wt0mKs+Q=; b=AsQEUsTlCqq+gGb70/2OAehiNTl6HcufK/C7vahbTLMq1S1ZtEc4m75NFw2QHtKoVu 9BwSXblmeVt6vH0AP2ryw3YCuX/sDO5FkU1y9Vt9g4LtluW/RtHvZr09pemGTRm/r0iX 1gp2gxqbJf9KiNp0bD+djNyYP5Fr0FUPrBAyX4q69U8c8kog6TrkRbsOmRXC3PkbAlU3 agcbvAOBBqceK2yBSnAmRWRF2XUiMTvqSWwv9L/tEy2HtpaJY//ulOtYMHkzYNiC7FJ4 DzSCI/2x1GlEmBQWhBaVDcY+1Vam78MHkZJhn9pdkLfOuVvQiOpF+2xwPWCfiLMgmaIv ZExg== X-Gm-Message-State: AOJu0YwQzkEhHgula8MjNuOBbrt2BFwL3PZL4X/Jxj09GRb07dwVvDfO 9XMqvuhEFW2dsgC8lQBVuS2XcqS0Too= X-Received: by 2002:a05:6870:7a18:b0:1e9:9440:fe4a with SMTP id hf24-20020a0568707a1800b001e99440fe4amr7184435oab.3.1700753521290; Thu, 23 Nov 2023 07:32:01 -0800 (PST) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id h7-20020ac87447000000b0041ea59e639bsm545068qtr.70.2023.11.23.07.32.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 07:32:01 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Nov 2023 10:31:59 -0500 Message-ID: <20231123153159.1376918-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.42.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] avformat/hls: use av_strlcopy instead of strncpy X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MbRAjWBZy/HL Avoids a -Wstringop-truncation warning by using av_strlcopy instead of strncpy. Additionally, prints a warning to the log context if this truncation occurred. Signed-off-by: Leo Izen --- libavformat/hls.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index f5f549b24d..61e2d67588 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -540,11 +540,16 @@ static struct rendition *new_rendition(HLSContext *c, struct rendition_info *inf } if (info->assoc_language[0]) { - int langlen = strlen(rend->language); + size_t langlen = strlen(rend->language); if (langlen < sizeof(rend->language) - 3) { + size_t assoc_len; rend->language[langlen] = ','; - strncpy(rend->language + langlen + 1, info->assoc_language, - sizeof(rend->language) - langlen - 2); + assoc_len = av_strlcpy(rend->language + langlen + 1, + info->assoc_language, + sizeof(rend->language) - langlen - 1); + if (langlen + assoc_len + 2 > sizeof(rend->language)) // truncation occurred + av_log(c->ctx, AV_LOG_WARNING, "Truncated rendition language: %s\n", + info->assoc_language); } }