From patchwork Thu Nov 28 13:41:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 16472 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 E17554482D5 for ; Thu, 28 Nov 2019 16:05:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C830668B0A4; Thu, 28 Nov 2019 16:05:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 105E168AFCC for ; Thu, 28 Nov 2019 16:05:47 +0200 (EET) Received: by mail-pg1-f175.google.com with SMTP id t3so12527100pgl.5 for ; Thu, 28 Nov 2019 06:05:46 -0800 (PST) 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; bh=elKDmwlktYJjCuzZXOrUCJv/b9EpHYDQgjs7u1XpCQg=; b=jwQ4c1mYZS5ZwIBFkv7aouxZ3XGcw9yIBUI0YirNeLO8eHDKUl0Hbwez+qec0/51X3 HZQTT/vyVF56UdV48MnFCOsonJ3782uXUg44Jne91BVBhnhXZctIKoVkjUHRdil70Ez7 EieF0KkPtTBO+XhFvzWzWxbp2eH/itcaTE6zRooutBrL28pt89xTqtITkGXC+nRjgecg YfcgB9SRgd5a8Cr9dAR+bf21rzvkWPvZ582JUTPSQ3sYKJR9dssrFQ2KpeqhkkgG8wm9 wtPKRKbpfDFMjPegvFR1xyP1jQcfiL0HTnDHXz6W5QJxxUtVGnZO7ADgM3rN89qI5K0H uGLw== 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; bh=elKDmwlktYJjCuzZXOrUCJv/b9EpHYDQgjs7u1XpCQg=; b=CKB8jsmFEywLe7d3vCWNQOZDrwBKx8oikxWD8W4FNk7ooQJzKaO0lhlmZFM8+O6qHC zjU4+Ofcqe7d5GN4cKVLbOzIDKHI0cPl4nsNf5I63ln2bpelgU1XovcrxfRP5rtQ2O0l Kl48o6svN0sqy+g87mLUx11hMy/b66Iu2hCr96jfY/SgvER6HYsGQydOxdN83mNvkqzy tul2GwgtpAcZmh3U9I0WSv29cnYeTcS5l6tIsoY8RopdXuLJ+5M04XP0w4hDC6A0XD6o yxLzi1UoN5tWqV+q/oNC78cwSkBmyVlSd1NHnHZILpnH9TPpyHb9dGbYzc+QY5VnePu/ Psqw== X-Gm-Message-State: APjAAAXEzv1thDjDsYzy/x2zU/VJ9C3ejnxUtyjhNnFzhF005WWsYavN tKP6J7fyWwuyzZJOXKUHUwdOTQ2x X-Google-Smtp-Source: APXvYqzhUxm7SKxueWCjLmnK+hzToeCAytf6xhw2LOSkNFxGlA1Dz2jDTHOt1xwzHhUHt4oy6zIdQQ== X-Received: by 2002:a17:902:7b84:: with SMTP id w4mr9336349pll.297.1574948475194; Thu, 28 Nov 2019 05:41:15 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id r16sm20646067pgl.77.2019.11.28.05.41.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Nov 2019 05:41:14 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Nov 2019 21:41:00 +0800 Message-Id: <1574948460-15981-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1574948460-15981-1-git-send-email-mypopydev@gmail.com> References: <1574948460-15981-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] lavc/mvha: Check init_get_bits8() for failure 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao fix potential null pointer dereference Signed-off-by: Jun Zhao --- libavcodec/mvha.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/libavcodec/mvha.c b/libavcodec/mvha.c index 636b5e6..4b03a79 100644 --- a/libavcodec/mvha.c +++ b/libavcodec/mvha.c @@ -190,7 +190,9 @@ static int decode_frame(AVCodecContext *avctx, GetBitContext *gb = &s->gb; int first_symbol, symbol; - init_get_bits8(gb, avpkt->data + 8, avpkt->size - 8); + ret = init_get_bits8(gb, avpkt->data + 8, avpkt->size - 8); + if (ret < 0) + return ret; skip_bits(gb, 24);