From patchwork Sun Mar 21 09:47:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26510 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 D6E3A449A95 for ; Sun, 21 Mar 2021 11:47:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86B1668A987; Sun, 21 Mar 2021 11:47:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A26868A862 for ; Sun, 21 Mar 2021 11:47:53 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id g20so7796684wmk.3 for ; Sun, 21 Mar 2021 02:47:53 -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:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=m21EqJTDG/KVslCWIfzhccDbjXc/qGrzWLUmH7Y9WU8=; b=FL7f2WbVljPeLWEP35CLVzKwxsfdjEiE0CQI66g0P6H1ZBK/0xVw1gSIR1jS65qqiT VqM6vNNlXVjh4syZB23HrZBPRPdgbL+xQfue8QmUfzsxPk9axm1xmWH9sv8lwKE7rAJE fLcq4OuX6XAd3vR6e+laErPw9SGPpHBMFhNOWaIzHNhDV3gM97nAvwcoeTE5dsoAy2Pb bBQ87hMOBJq6iWrkbWOYKir/gb7Th03DHtz63aWC9e0tRMByb6r2RgnsMpybKVoUwaIY lDQ9i1A2HjmbMHNR+WATEcQGwJ1ATq5CN2C7al161pC6zBLHv7RUlU9BpyD1KI+MFZEE ED2w== 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:reply-to:mime-version:content-transfer-encoding; bh=m21EqJTDG/KVslCWIfzhccDbjXc/qGrzWLUmH7Y9WU8=; b=Q4zxbuWqi/HdLNjruDSnCVx2DadMNTGSAgUTh/Wmp16H43Pfp3XnFgJg8fXxDNEPCX 0M8Ij1sje1723uIBMDWWxq1TT7/iB+juzxt60N4LHsM3O3ZVGHXA6XeFrYqtXvsmP7QK lj6+WeVxsKwLUv3v9JjIkzAGc8NKxQ+8C4/gqP7L0PN7/EgzVM3wliHj6VSAexG5CnNa WlaRSk5HxOk9sxHraqwKRdQmQE4DCdhnTc1R0EqRt+L9RYLrvJo8vNb33AdbMh8Ps28e WWR9nmvN4qffe0LLAKdHE2JoeokzfKIIjo/CTalYZzEleX7P0LXpQByGIFO9+LsY7ifG HKNw== X-Gm-Message-State: AOAM531m7UgMD+lOGxcrq8FsvRUq5SO8ZodemeWxzL711FGQEvqDST8M GhhQMfVFhSI8MAvLuqj+zscMhJARdAH3zg== X-Google-Smtp-Source: ABdhPJxrq+K09WxuKKf/NpL673Wsaxnd+1xpXbp1MFjrmc2Qh05e21pld5dBXAGlqoRvbT+VV1sT/g== X-Received: by 2002:a1c:1f4c:: with SMTP id f73mr10997553wmf.25.1616320072602; Sun, 21 Mar 2021 02:47:52 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id m14sm11649387wmi.27.2021.03.21.02.47.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Mar 2021 02:47:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Mar 2021 10:47:19 +0100 Message-Id: <20210321094722.447294-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210321094722.447294-1-andreas.rheinhardt@gmail.com> References: <20210321094722.447294-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avcodec/avcodec: Don't use NULL for %s printf specifier 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" Our "get name" functions can return NULL for invalid/unknown arguments. So check for this. Signed-off-by: Andreas Rheinhardt --- av_get_colorspace_name() can even return NULL for supported colorspaces. libavcodec/avcodec.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index 3088d2ff3f..93383dc9fb 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -607,6 +607,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) int new_line = 0; AVRational display_aspect_ratio; const char *separator = enc->dump_separator ? (const char *)enc->dump_separator : ", "; + const char *str; if (!buf || buf_size <= 0) return; @@ -642,14 +643,14 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) av_strlcat(buf, separator, buf_size); snprintf(buf + strlen(buf), buf_size - strlen(buf), - "%s", enc->pix_fmt == AV_PIX_FMT_NONE ? "none" : - av_get_pix_fmt_name(enc->pix_fmt)); + "%s", enc->pix_fmt == AV_PIX_FMT_NONE ? "none" : + av_x_if_null(av_get_pix_fmt_name(enc->pix_fmt), "unknown")); if (enc->bits_per_raw_sample && enc->pix_fmt != AV_PIX_FMT_NONE && enc->bits_per_raw_sample < av_pix_fmt_desc_get(enc->pix_fmt)->comp[0].depth) av_strlcatf(detail, sizeof(detail), "%d bpc, ", enc->bits_per_raw_sample); - if (enc->color_range != AVCOL_RANGE_UNSPECIFIED) - av_strlcatf(detail, sizeof(detail), "%s, ", - av_color_range_name(enc->color_range)); + if (enc->color_range != AVCOL_RANGE_UNSPECIFIED && + (str = av_color_range_name(enc->color_range))) + av_strlcatf(detail, sizeof(detail), "%s, ", str); if (enc->colorspace != AVCOL_SPC_UNSPECIFIED || enc->color_primaries != AVCOL_PRI_UNSPECIFIED || @@ -658,12 +659,11 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) enc->colorspace != (int)enc->color_trc) { new_line = 1; av_strlcatf(detail, sizeof(detail), "%s/%s/%s, ", - av_color_space_name(enc->colorspace), - av_color_primaries_name(enc->color_primaries), - av_color_transfer_name(enc->color_trc)); - } else - av_strlcatf(detail, sizeof(detail), "%s, ", - av_get_colorspace_name(enc->colorspace)); + av_x_if_null(av_color_space_name(enc->colorspace), "unknown"), + av_x_if_null(av_color_primaries_name(enc->color_primaries), "unknown"), + av_x_if_null(av_color_transfer_name(enc->color_trc), "unkown")); + } else if (str = av_get_colorspace_name(enc->colorspace)) + av_strlcatf(detail, sizeof(detail), "%s, ", str); } if (enc->field_order != AV_FIELD_UNKNOWN) { @@ -681,9 +681,9 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) } if (av_log_get_level() >= AV_LOG_VERBOSE && - enc->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED) - av_strlcatf(detail, sizeof(detail), "%s, ", - av_chroma_location_name(enc->chroma_sample_location)); + enc->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED && + (str = av_chroma_location_name(enc->chroma_sample_location))) + av_strlcatf(detail, sizeof(detail), "%s, ", str); if (strlen(detail) > 1) { detail[strlen(detail) - 2] = 0; @@ -741,9 +741,10 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) "%d Hz, ", enc->sample_rate); } av_get_channel_layout_string(buf + strlen(buf), buf_size - strlen(buf), enc->channels, enc->channel_layout); - if (enc->sample_fmt != AV_SAMPLE_FMT_NONE) { + if (enc->sample_fmt != AV_SAMPLE_FMT_NONE && + (str = av_get_sample_fmt_name(enc->sample_fmt))) { snprintf(buf + strlen(buf), buf_size - strlen(buf), - ", %s", av_get_sample_fmt_name(enc->sample_fmt)); + ", %s", str); } if ( enc->bits_per_raw_sample > 0 && enc->bits_per_raw_sample != av_get_bytes_per_sample(enc->sample_fmt) * 8)