From patchwork Wed Jan 30 21:27:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chcunningham@chromium.org X-Patchwork-Id: 11917 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 1126944C324 for ; Wed, 30 Jan 2019 23:35:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2960068AC5D; Wed, 30 Jan 2019 23:35:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B52B568ABA2 for ; Wed, 30 Jan 2019 23:35:20 +0200 (EET) Received: by mail-pf1-f195.google.com with SMTP id c73so407154pfe.13 for ; Wed, 30 Jan 2019 13:35:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ahX1gYmHZFuyLuBb+MX3bisxGDLj1ozVnV/dftz+pic=; b=c3XDV4TEG+xtzvjeiQWs8dv1/PEX185gu+esDmxhc47XBRaK7BBimad63rCqgeRmhh HIsAvAEZdoJDDKHlp1mtOL5kk3NQx4WBs1zVY7XHi6GPajBo3g+yyZaQgZSN/QIcj8XV Dl1F9DpFLuN0rS2D3Ysq1nQncQZ+sGAKjphqU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ahX1gYmHZFuyLuBb+MX3bisxGDLj1ozVnV/dftz+pic=; b=G2c7DSugI/xSp9jxBNF/ov/cM+Bo9h9RpU5qPCl3Ku22BAJZcGnLX/0zcLvNHdMaG9 568WJyB+3B3oDRU1NEJzRhLpuhvvTnG6KOwOptt57+0PZq4E+8vbuo5uAllOtCijTY8o NXOQcy5paLd//JwoI0lmYADLj+e5wmrG07AbG6P2YDLxUkJjIWy3m+qmVdiny00UnB1M 8grUCQmP/mPOWk529dVut1uAB0GQNZYio5BK6ALsOC3SK525CvJUXrXvxb9wBw9aVCdB OIApfEI6tSradKVyyNO2pFEszURjitw/6CxDTY9iCNteKP+NurDAVoOU3IVoQf7x5j56 yCOQ== X-Gm-Message-State: AJcUukcqWPLF1S29gWw6AgtL2FJVy4JmaEdikqFBppdj4l3y/xT7GUsN LoOKMgEfQtdMzBLUs2UL1+bUxQFUc0o= X-Google-Smtp-Source: ALg8bN4snvSHP0CylEbeWHMAhxstns3V2QckWdPQe1TuW25kjmumG6zC9tTB4F7nJYTSZizkrYlwNA== X-Received: by 2002:a62:be0c:: with SMTP id l12mr31391481pff.51.1548883716003; Wed, 30 Jan 2019 13:28:36 -0800 (PST) Received: from chcunningham-linux.sea.corp.google.com ([2620:15c:38:200:74b:ad27:5acb:a21]) by smtp.gmail.com with ESMTPSA id z191sm3315208pgd.74.2019.01.30.13.28.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 13:28:35 -0800 (PST) From: chcunningham To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Jan 2019 13:27:29 -0800 Message-Id: <20190130212729.116453-1-chcunningham@chromium.org> X-Mailer: git-send-email 2.20.1.495.gaa96b0ce6b-goog MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/gsm_parser: return -1 on parse error 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Return replaces an assert0. libfuzzer generated a testcase that triggered this assert (codec=0), causing a crash of chrome's renderer. --- libavcodec/gsm_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/gsm_parser.c b/libavcodec/gsm_parser.c index 1054a30ca9..5cf2235f73 100644 --- a/libavcodec/gsm_parser.c +++ b/libavcodec/gsm_parser.c @@ -56,7 +56,7 @@ static int gsm_parse(AVCodecParserContext *s1, AVCodecContext *avctx, s->duration = GSM_FRAME_SIZE * 2; break; default: - av_assert0(0); + return -1; } }