From patchwork Fri Mar 19 15:16:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26491 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 5665F44A5AC for ; Fri, 19 Mar 2021 17:16:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 201D768819D; Fri, 19 Mar 2021 17:16:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03B5C687F3C for ; Fri, 19 Mar 2021 17:16:22 +0200 (EET) Received: by mail-wm1-f52.google.com with SMTP id n11-20020a05600c4f8bb029010e5cf86347so8542052wmq.1 for ; Fri, 19 Mar 2021 08:16:22 -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:reply-to:mime-version :content-transfer-encoding; bh=X8DidDc6YDf4wl/tM3FKTvtEVrAQvxuutudzlwJQ0lk=; b=fICPONRiDnK0FyyPbd6gS0jQxhBROLGEANP06t5iR6NYfGGCMt5w4OWKVP659ZAXCt SblOkiWmxfPGEmr8JTLb8lMMTy7IpvlLu71A5jknaMkGWDt4ey2jtNLpLDxMnNJE8T27 1wcEunAdEVazAhRWqLllhFT/Pg0Cw42BPdQDALlgfGTnyxrUlPzjT2nKHYJJd9ae12UR QMbJmOVgm7VWDaxF3likKe8pK7T8BVsG86MIsEFoYrdGA90y/fvukg1LDxmN0h7Yn231 qcUY856CedHhZM9hbCWOnil0LgvPSq53p+SD6DKUlEDKOsf31Egq4Nhi60wpjr8wsAyW M2lQ== 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:reply-to :mime-version:content-transfer-encoding; bh=X8DidDc6YDf4wl/tM3FKTvtEVrAQvxuutudzlwJQ0lk=; b=X4uhy4jL0NmlxJ5+E+PdWrMIzv4qSIl7zySToTud4dOd/QZUPNa9GZRO+XCsbftCbv RzDeqdgEXDB7s1QFAU1gJreND30S6QDzTRGEE1ev9+tMHJQbpV98Pw1G/HQpn4mKeJGb x9N3fJgzWBhh41ffl+lcPb49AOaFathp7fJ2mZ9kjktgHOgFaJ6AojAWsG4QK+Bk/Hw5 5GH0wh3M/vGSpNOnvOies9C8OXuJK+i+5HqYM6KtqW1bvWUbUwoN+8JqMsDXEXr4zBZ+ cjRsGvoYBxnnxAEY3tMHqkVUUOklinuDSxIG/inwO6/vSq3V1gYfbEZQz+qNaEhPpfKP u3zw== X-Gm-Message-State: AOAM533tm5Jly1lVHaYlLk4T9QSmNZzQ0y5kvif70FYUmffnGVl7eibO JNrkZk6tHrGLPPSVHg61XHF7OdxNV5zntA== X-Google-Smtp-Source: ABdhPJyAItyVSIg4zso+iVIpqK9zT1j+KcDSdb/juynRmtNzfTPCLFn6rOfPB/JRDx1u2BNO2/PDbA== X-Received: by 2002:a1c:4145:: with SMTP id o66mr4325181wma.68.1616166982173; Fri, 19 Mar 2021 08:16:22 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id g11sm8303613wrw.89.2021.03.19.08.16.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Mar 2021 08:16:21 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Mar 2021 16:16:15 +0100 Message-Id: <20210319151615.2323253-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/parser: Don't return pointer to stack buffer 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" When flushing, the parser receives a dummy buffer with padding that lives on the stack of av_parser_parse2(). Certain parsers (e.g. Dolby E) only analyze the input, but don't repack it. When flushing, such parsers return a pointer to the stack buffer and a size of 0. And this is also what av_parser_parse2() returns. Fix this by always resetting poutbuf in case poutbuf_size is zero. Signed-off-by: Andreas Rheinhardt --- This needs to be applied before https://ffmpeg.org/pipermail/ffmpeg-devel/2021-March/278004.html libavcodec/parser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/parser.c b/libavcodec/parser.c index f4bc00da7d..11c41d6a0a 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -179,6 +179,9 @@ int av_parser_parse2(AVCodecParserContext *s, AVCodecContext *avctx, /* offset of the next frame */ s->next_frame_offset = s->cur_offset + index; s->fetch_timestamp = 1; + } else { + /* Don't return a pointer to dummy_buf. */ + *poutbuf = NULL; } if (index < 0) index = 0;