From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 66C0E4C99A for ; Thu, 10 Jul 2025 16:26:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id DA974690052; Thu, 10 Jul 2025 19:26:50 +0300 (EEST) Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 7EE9E68E44A for ; Thu, 10 Jul 2025 19:26:44 +0300 (EEST) Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-7179205a439so12196997b3.1 for ; Thu, 10 Jul 2025 09:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752164803; x=1752769603; 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=ht0v5jyPlXsziySvgZS9OJxKpuO5HpQ7RCFYjABI3uw=; b=Vm9iueikOwqVtnAXceXcum3cRu3MHPjJZug2aDsU9+H5HY8NTz0H6k7HX/oD0vaBWY U/ks1YJKRPMyLisGywn6gz9cWDS1Oq9oTmN7+TUIXmMs+HyVSGnHhEL4mx38uWkth+Jv KbGsqZYphbBoHD4PrbnAyyZqyWMPKpD9koZ6o7pgbg9Loyzvv2ZeKk9U0fJMZ5ouEu/5 bN2f0vyem/MriC8QCFKeNKxqu7ItXdnEgVxjclHgGUJA7Yrxg4Qor1fMBRfXrFIPz1lQ T21lYK+IkQsz3Ymo7ZG2BwcUFfmElf07GssZCCxgD/eA8uCczmtZpzZu96TINjcmnbfm jHcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752164803; x=1752769603; 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=ht0v5jyPlXsziySvgZS9OJxKpuO5HpQ7RCFYjABI3uw=; b=S1lr3k+df8enqy6Ih36TVHRUxyDPfLNtOyePGdXC4hmfqFmNR+TQsWq1YqwLuXBaf4 4q0P9sFjQXWm0W+TXTcAKtTZG/H9XDFDeIWYlZxrHIVj+ZjCCCyBVPtj8X6NHP5ZlBEj cb+8190Ve3LEJOOtoFOB4kuYYg04kO+edvOONKA3cK0qxYmIflkqtHGnYbSiJeMWaXH2 w5DBOWYbGjVPLWqz/NTZQ94nvXwvnAck6R1ko7y4WoDoetAvK44R0FWQD60rVncD22aw otO3diuDxcTwC5t+vVbnYVIAv0ZLTFPkodXKX4Q+eLpfE4CKvBmj0UtVMaud8elEp3vp iQkg== X-Gm-Message-State: AOJu0YwBB0y/DHETiGeTpKGtC9XbncJR59OTyL96VfxPqHbX3qpW+pUT oORYmHOG0+WNPGnMaNmoCxX0lvpSb4o0liPItkwKXObp3i4lKEBpA9kUVATT/A== X-Gm-Gg: ASbGncslIbtG29d/YnF/ZsRdHckOrzFxw/weta4wjQtBEZgk2Z9NOB0oIaXNzbM9yH3 2pdugRMx7xbYxw4Ndn7t/yeP9Qpsn4TIImhzAjWiKfQ73QWIDaprZRt8HJljZpvnbqQUZIJdg36 MDtiXH6quFeIYKNXXcL/U+Kg7tXZccFWfU/sVF0pyK2MuGAuO1/cSfglc9Z/zDBTTP7r95Ps+lj eGtrABRua6EXb6zN7/PLGqXjm6jH/Psa+6IBDdewHzuDMleLOWFiYlgy+lA2sBomNPbQgdY5DF2 C45UYtG5EIVbN1sZiLdrjjGCw2UlsRnAIzHzEwwRiD7eJp1qG9+5WQOXxeLxivk8zYk2/Dq7+Ue LG5yRHHc5 X-Google-Smtp-Source: AGHT+IG7BntEWbkMwchQUN/zkCi4bIQ+RJIZHVp+3Q1rK9pz/SKxHZiI3WIObHArbfetg2RUTqQRCQ== X-Received: by 2002:a05:690c:450f:b0:70c:ceba:16 with SMTP id 00721157ae682-717c1623e6cmr69060017b3.17.1752164802672; Thu, 10 Jul 2025 09:26:42 -0700 (PDT) Received: from newman.cs.purdue.edu ([128.10.127.250]) by smtp.gmail.com with ESMTPSA id 00721157ae682-717c5d6d8c7sm3529787b3.38.2025.07.10.09.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Jul 2025 09:26:41 -0700 (PDT) From: Jiasheng Jiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Jul 2025 16:26:39 +0000 Message-Id: <20250710162639.48327-1-jiashengjiangcool@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] libavcodec/alsdec.c: Add check for av_malloc_array() and av_calloc() 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: Jiasheng Jiang Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Add check for the return value of av_malloc_array() and av_calloc() to avoid potential NULL pointer dereference. Fixes: dcfd24b10c ("avcodec/alsdec: Implement floating point sample data decoding") Signed-off-by: Jiasheng Jiang --- Changelog: 1. Wrap the if condtion. --- libavcodec/alsdec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 734eec8bf8..97b04a95f9 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -2119,8 +2119,8 @@ static av_cold int decode_init(AVCodecContext *avctx) ctx->nbits = av_malloc_array(ctx->cur_frame_length, sizeof(*ctx->nbits)); ctx->mlz = av_mallocz(sizeof(*ctx->mlz)); - if (!ctx->mlz || !ctx->acf || !ctx->shift_value || !ctx->last_shift_value - || !ctx->last_acf_mantissa || !ctx->raw_mantissa) { + if (!ctx->larray || !ctx->nbits || !ctx->mlz || !ctx->acf || !ctx->shift_value + || !ctx->last_shift_value || !ctx->last_acf_mantissa || !ctx->raw_mantissa) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); return AVERROR(ENOMEM); } @@ -2132,6 +2132,10 @@ static av_cold int decode_init(AVCodecContext *avctx) for (c = 0; c < channels; ++c) { ctx->raw_mantissa[c] = av_calloc(ctx->cur_frame_length, sizeof(**ctx->raw_mantissa)); + if (!ctx->raw_mantissa[c]) { + av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); + return AVERROR(ENOMEM); + } } } -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".