From patchwork Thu Aug 22 10:06:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 14652 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 66376447AB8 for ; Thu, 22 Aug 2019 13:06:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4160E68ABA0; Thu, 22 Aug 2019 13:06:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28B0168AB76 for ; Thu, 22 Aug 2019 13:06:16 +0300 (EEST) Received: by mail-io1-f47.google.com with SMTP id z3so10735984iog.0 for ; Thu, 22 Aug 2019 03:06:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=J8quknIFXwNZIxvtoQSTb/H7vF1UXWaCQQe2kGT1+XI=; b=TFrdmf6RnKzx+EVZk/gBq50uc1aTftTPl3ABugoeMTAd4zOqJbRkh8WGs7u1165kjW UueEim5Cge6TPLlTMtORaheWatn4GihyaD3cTh7r3snCCrbAlkJ0TL9EmUT2Q1vaA9Nz xLZA2eyVfASwq7khMPnr2SSnx4h3c42cvDKHhVd2davy0DMilUUy6ZzDZVBHq0vMHgv3 wrURtehND+fSKKhOQo6EGXYJp2QBLSRthtj9rso78QSQr4wY2f4uMbe0h+9mCo2/N0aI zt72PYRgzno9KQ8jvLIwvUolKzzrasGr3AyYx+Q2yM4QA6w/ui12295Y2vj/5Wzd3t7N YhNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=J8quknIFXwNZIxvtoQSTb/H7vF1UXWaCQQe2kGT1+XI=; b=NIs85XhaFPcYMsYQhP4s2bEIrRg7+ApXPqQLs1YMIb8URrEKPmmjJhta52EoO4dG4F 4krxuUPQQw4suz/SANFwvB2lbKs+GoEoHuUCipduPQ14+4Hm69GJ/5kvdLyaHHtWh9lb djm4fQ060bEvpP99tPqxUaBdOQbFD3ko6CWialCQX6xzyLLuPGQ+H2FrSfZ3ATjsZ3eJ GuTSVN1zxQj70kBRuQexZp2rzxowucZH+iTykHJhBvf/kEzxMjRxUomM0we11hzx6VEV 9DT6Ekse3VNeunB0WwmYi40y1ZipyQlDvXCvJ578z3Ota344D6VdlDyE76mkudbm2rxM pd7g== X-Gm-Message-State: APjAAAXjQU6x2jxQs9WkNcUneQTuv0IQDI2FgL0JhVLN37rygmx9MDcZ Ww2Mxr1IekECwdVXVfJTLqi1T9GEaDtFEqEHOxomjA== X-Google-Smtp-Source: APXvYqyLCTPH5NwN1w4YjZeIg3Wa8MralyH/YwfZHlOqWUvoL/leqoBPhtyLaJyLESBIzHSnH0/2+NNh8Se0uofcCks= X-Received: by 2002:a5e:8c03:: with SMTP id n3mr2645370ioj.125.1566468374520; Thu, 22 Aug 2019 03:06:14 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Thu, 22 Aug 2019 12:06:03 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/r3d: Check avio_read() return value 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" Hi! Attached patch fixes usage of uninitialized data reading broken r3d files. Please review, Carl Eugen From efce9940b890b9cf5a9e7400b05be10f6906fbb1 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 22 Aug 2019 12:02:36 +0200 Subject: [PATCH] lavf/r3d: Check avio_read() return value. Fixes use of uninitialized data reading broken files. Reported-by: Anatoly Trosinenko --- libavformat/r3d.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/r3d.c b/libavformat/r3d.c index 224bcf780d..919c3c4960 100644 --- a/libavformat/r3d.c +++ b/libavformat/r3d.c @@ -98,7 +98,8 @@ static int r3d_read_red1(AVFormatContext *s) r3d->audio_channels = avio_r8(s->pb); // audio channels av_log(s, AV_LOG_TRACE, "audio channels %d\n", tmp); - avio_read(s->pb, filename, 257); + if (avio_read(s->pb, filename, 257) < 0) + return AVERROR_INVALIDDATA; filename[sizeof(filename)-1] = 0; av_dict_set(&st->metadata, "filename", filename, 0); -- 2.22.0