From patchwork Sun Oct 29 12:47:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 44424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp899570pzb; Sun, 29 Oct 2023 05:47:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAcK4t/mOkp5jy9De+B/hYR3sfAN6qTkDq103E5MkiNP83qZy7NAVplHUm+9MLiYNRjF2J X-Received: by 2002:a17:906:a044:b0:9d1:92bb:ce74 with SMTP id bg4-20020a170906a04400b009d192bbce74mr3058993ejb.38.1698583659440; Sun, 29 Oct 2023 05:47:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698583659; cv=none; d=google.com; s=arc-20160816; b=qC/dENE9u/Gu6JvoVSDskhJkkHzHao1KCXr+a1UmSl6XMaiKpKDvHRoShHa6MWYD3c uxRCSgzmRgTVg6lvyyksUJX7rwHkI1najoiB4r/QpqE2XA+N1fgcUocEcABfGhs/ZUyP cSrN+ZiE/ZQ+hqQVUthOPZphAezeuH56vlLCPw8rqfuJi2oV+/a9HlsxPWVgRawvX3Fo iNWsXEJZNmadf+KJhTQPQhEthIqjOo4Mu6gnVX56G9v96S+wZK18f4oqZUIQ/YbghFuM Kqqa+QRfAzGTQexZlVVb2mq/X0PezeykQK/tyO/ox9un4N8UHouY4IrYThoAPn2k/XiQ eoAw== 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=1QXmj8c2Gohmx2jO+Rv4PSAYJeSfMHfUtGmmtRx80Cs=; fh=+bdjGe20eEUjtjncwA1dnEEVYNfJL4vyhV+sIRR4l+g=; b=bXXyLadsDlqGGWn02CAnV4OC+LwFrpOHM/jbr0saPVIL3r2hQzJPq7IX28/+xOZhCR +l/2F8yn6clP4YRXA2bKzrlCoPYYJuTei1jfOSMSlBxmoSi+honXwvwNEB+y6ipThMc5 KTIRs5UqllHYslp82BUVvJlcm/0KgYKg5dSIxlBOHHevF6XgknQt8cjBlBwQyjQ5q/lT FD4LDv/sqIiuizzk55BWK8WXjyZrnFEsVjwK6aLp/boG1fZz04WQxNtNrSDbxhW0Ec6o 2GEvLehMd/CLzeZljlUI9/n1StoGZv411XpkXve0Q+JTJMbA+VZe9S674Xctg7wxCZr3 XWkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=DjCBLmUp; 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 ne40-20020a1709077ba800b009b92f98aaa4si2551629ejc.250.2023.10.29.05.47.38; Sun, 29 Oct 2023 05:47:39 -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=@gmail.com header.s=20230601 header.b=DjCBLmUp; 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 3476768CAFF; Sun, 29 Oct 2023 14:47:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f42.google.com (mail-qv1-f42.google.com [209.85.219.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EB6468C5BA for ; Sun, 29 Oct 2023 14:47:29 +0200 (EET) Received: by mail-qv1-f42.google.com with SMTP id 6a1803df08f44-671188b2d44so3066746d6.0 for ; Sun, 29 Oct 2023 05:47:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698583646; x=1699188446; 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=LgL7Sawr1izttvmVh7e6Nq3EquevLGNf+CNoovo0/74=; b=DjCBLmUpg2TZfTUpSj55G5jXICcNguFF5wDHXoZNHRQUjW4TeL3swTx2ebCBVQYFNs O3jDMovjyPl02lN6pRml1B3+9j48Rn+8nz6WXlZKZ7XdycFc8XbKGv0k1KIpTVIlYd1c NLAYT/UoZrMZfCpDYmK5ym4YyPYJtqMVAP94J/I6AGZAgUg2wbmJgFiBq+4TtQiRTR8h zy2p7LcSp19DCyFk6HBJdTC+M+HL1VDdCMpgnLNmLWgMsubEc6R2rTpcMu5SlA7vRr41 OnohYg1i47mqJRQ7CpHwSA3wWxTWlzKolX6xhbYVYVWue2wolIVOD3wjcHb7DZ1QYM24 KWAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698583646; x=1699188446; 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=LgL7Sawr1izttvmVh7e6Nq3EquevLGNf+CNoovo0/74=; b=rdfjubC7qgsYsM81jk+HHSS7UT/pg32JtiIFae1jiXxWZZVNbAsOqvSk+fegYsImUv yJQQiPr9SB7AP7R8qETunUfwBw4twDZLI7TBZvGkDGVcGlfKOo3aMjdt7SGb/r+bUYsY 20gKQ4cPZBDYQwmhxwoSYBocM3ZTGqCXVY46imSm/frGvfarHs7RHwR1KbGQDyhSPXtV HB0TQiLSkJEc+1X/r6xhyKgQY4D4NJd0JlUhrlLommSlTzZbnnopEw1rq7Y0Ux5rTiET aypL4ktC6LUPiWP2MEcumvkmSa3PJ9dTE+tdJoNbBuL4etYbIZdTsqyFZCxblheqpsgm jFyA== X-Gm-Message-State: AOJu0Yy13+4RHPp7ATiLD0WLHTxWGNuEQbdymaH7Dwvai2FMKzPlRAGW WnSeGwu3F09oTfyRhvuQp4IqyJOLmA63EA== X-Received: by 2002:a05:620a:470e:b0:775:82e2:dc19 with SMTP id bs14-20020a05620a470e00b0077582e2dc19mr8600049qkb.2.1698583646540; Sun, 29 Oct 2023 05:47:26 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id m20-20020a05620a24d400b007756c8ce8f5sm2409961qkn.59.2023.10.29.05.47.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 05:47:25 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Oct 2023 08:47:23 -0400 Message-ID: <20231029124723.398581-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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: m/7a3CDx6YJS Avoids a -Wstringop-truncation warning by using av_strlcopy instead of strncpy. Signed-off-by: Leo Izen --- libavformat/hls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index f5f549b24d..39440176c9 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -543,8 +543,8 @@ static struct rendition *new_rendition(HLSContext *c, struct rendition_info *inf int langlen = strlen(rend->language); if (langlen < sizeof(rend->language) - 3) { rend->language[langlen] = ','; - strncpy(rend->language + langlen + 1, info->assoc_language, - sizeof(rend->language) - langlen - 2); + av_strlcpy(rend->language + langlen + 1, info->assoc_language, + sizeof(rend->language) - langlen - 1); } }