From patchwork Sun Jun 30 23:12:14 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: 13782 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 7F3F9447F4F for ; Mon, 1 Jul 2019 02:12:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AFF0688357; Mon, 1 Jul 2019 02:12:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62B166805C7 for ; Mon, 1 Jul 2019 02:12:27 +0300 (EEST) Received: by mail-io1-f45.google.com with SMTP id s7so24442226iob.11 for ; Sun, 30 Jun 2019 16:12:27 -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=l/ZmEDXe695U5YvJZOJgbGgTOaABvCILs4MxsH4irv8=; b=R0kQF+whjDSo0wH7tIj/xRy8SaaJfhW2pUopjqRl+zUV6x/4Vme40R57b4V8wQNmsN lwwBD4/qII7Or5Rj9W/0jZI/HTvedWM7+p+2AC+KrZA0/PMyaeMEYlCPQc/aEli8vgj6 0IUgcxIn0CDCSU6dc4tcTFXx8TcGO3RDYsTEZEiGYNHdSkJ9d5mhIDfC3JlS2CmK+iCU Y9FJeEofOSXJ+2vFTC5YuIcueFNZqPEp5y6jvv8Y/ExpXtpAK9shBmDj+QGDiLC3NsVM fqe1GAg0dCiVD1nh+OaTiAxgzKI7tUoeGjvvKcEQF7yqrPEKT14lR28zpdhzTwg1RyV6 u4AA== 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=l/ZmEDXe695U5YvJZOJgbGgTOaABvCILs4MxsH4irv8=; b=M0NQSHEXQV62gvRJ6SQ5mOWwd7PyfrcvoRy1L/HbxOI5KAo1lQMTZRM0DH+FAejBkC k2pW/pFid+2XtbqN9STfa3qriRA7Yf+nW3zOckWJGvEmp/iD7utW0a8r8TbeX4B1SFma JlQl+nRkMjxeJVwLoUQTIPuajEZf16qWeDnGJJuMXSsDqAJXQ0wSHJwNGnpN0vWTxQza cIhwXgohCiRLrx7kftK7TDc7r7EXqExdZFI14bAt00FwqPQ/g/ByZx5x/3yTcJFaI4Me 5yqFKj3PhHfYKmXRPBSHzNJ3h8Qp9EfGOam4gmR4fgZ6I+BMn+6ucUE+e8W9TlEw19J1 TC/w== X-Gm-Message-State: APjAAAWwwHaSwIqZdrnBJhLOu9gVwfZbaF/Ff310ipMRGTaISHw5U8tZ OnrQ3ak6G4bFnUA68MmJjDa7bOcHEW5pE3cXjSd24w== X-Google-Smtp-Source: APXvYqyEHqzm23GPH5creqNBY4f8lJP5Rrsmc+a1xMA4ybZ25vfSFnxEtsPAuq9fK1jJiTkSzoK9dJOvBrIjqZH/g0E= X-Received: by 2002:a6b:6611:: with SMTP id a17mr18021942ioc.179.1561936345830; Sun, 30 Jun 2019 16:12:25 -0700 (PDT) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Mon, 1 Jul 2019 01:12:14 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/nutenc: Do not call memcmp() with NULL argument 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! Undefined behaviour was reported in ticket #7981, attached patch tries to fix it. Please review, Carl Eugen From d77386d4a18d6d749d15516b5eb6df90507bf1eb Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 1 Jul 2019 01:09:19 +0200 Subject: [PATCH] lavf/nutenc: Do not call memcmp() with NULL argument. Reported in ticket #7981 --- libavformat/nutenc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index e9a3bb49db..a3a097aacc 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -791,6 +791,7 @@ static int get_needed_flags(NUTContext *nut, StreamContext *nus, FrameCode *fc, flags |= FLAG_CHECKSUM; if (pkt->size < nut->header_len[fc->header_idx] || (pkt->size > 4096 && fc->header_idx) || + nut->header[fc->header_idx] && memcmp(pkt->data, nut->header[fc->header_idx], nut->header_len[fc->header_idx])) flags |= FLAG_HEADER_IDX; -- 2.22.0