From patchwork Wed Sep 21 23:07:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 674 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp1204893vsd; Wed, 21 Sep 2016 16:07:19 -0700 (PDT) X-Received: by 10.28.209.76 with SMTP id i73mr4992214wmg.104.1474499239120; Wed, 21 Sep 2016 16:07:19 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v69si23939800wmf.49.2016.09.21.16.07.17; Wed, 21 Sep 2016 16:07:19 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62DD3689CBA; Thu, 22 Sep 2016 02:06:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D5DC689BB9 for ; Thu, 22 Sep 2016 02:06:52 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1bmqbb-0003CH-I9 for ffmpeg-devel@ffmpeg.org; Thu, 22 Sep 2016 01:07:07 +0200 Received: from [192.168.1.3] ([80.110.105.96]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id mP761t00F24oXkG01P77Jg; Thu, 22 Sep 2016 01:07:07 +0200 X-SourceIP: 80.110.105.96 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Thu, 22 Sep 2016 01:07:06 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201609220107.06288.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavc/avpacket: Fix undefined behaviour, do not pass a null pointer to memcpy() 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 ticket #5857. Please comment, Carl Eugen From 20e673f5303fef7b0adc7737d2023bebfe18014f Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 22 Sep 2016 01:03:55 +0200 Subject: [PATCH] lavc/avpacket: Fix undefined behaviour, do not pass a null pointer to memcpy(). Fixes ticket #5857. --- libavcodec/avpacket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index a485064..c3f871c 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -139,7 +139,8 @@ int av_grow_packet(AVPacket *pkt, int grow_by) pkt->buf = av_buffer_alloc(new_size); if (!pkt->buf) return AVERROR(ENOMEM); - memcpy(pkt->buf->data, pkt->data, pkt->size); + if (pkt->size > 0) + memcpy(pkt->buf->data, pkt->data, pkt->size); pkt->data = pkt->buf->data; } pkt->size += grow_by;