From patchwork Tue Jul 2 20:56:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 13802 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 667E54487E3 for ; Wed, 3 Jul 2019 00:02:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 470C96883A9; Wed, 3 Jul 2019 00:02:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-2.mx.upcmail.net (vie01a-dmta-pe08-2.mx.upcmail.net [84.116.36.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02CAE68A4D4 for ; Wed, 3 Jul 2019 00:02:15 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1hiPup-0000IK-0l for ffmpeg-devel@ffmpeg.org; Tue, 02 Jul 2019 23:02:15 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id iPtqh96Nn5D5NiPtqhUwn1; Tue, 02 Jul 2019 23:01:15 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=bu8y+3Si c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=jErYGRz0OCN-K8oVoNkA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 2 Jul 2019 22:56:30 +0200 Message-Id: <20190702205630.25749-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfIw+fX7O9lwSKQSg3hbOkp11mVuQA1iyExoVf7mpaXQTkKar91IigJ+qfHC7g2a/vcVQzdfW6gBsCaDrgbKm9BVNcc4jtNOswIYl3YmOOB/D50D/ea5T f/areBVZA4XyTH/K34xxPP94j+fucs9E6j8BEMVxf9T7Hia+0ruBcPWM Subject: [FFmpeg-devel] [PATCH] avutil: add av_memcpy() to avoid undefined behavior with NULL, NULL, 0 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" Signed-off-by: Michael Niedermayer --- doc/APIchanges | 3 +++ libavutil/mem.h | 13 +++++++++++++ libavutil/version.h | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index b5fadc2a48..65b8ed74ad 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2019-07-XX - XXXXXXXXXX - lavu 56.31.100 - mem.h + Add av_memcpy() + 2019-06-21 - XXXXXXXXXX - lavu 56.30.100 - frame.h Add FF_DECODE_ERROR_DECODE_SLICES diff --git a/libavutil/mem.h b/libavutil/mem.h index 5fb1a02dd9..a35230360d 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -506,6 +506,19 @@ void *av_memdup(const void *p, size_t size); */ void av_memcpy_backptr(uint8_t *dst, int back, int cnt); +/** + * memcpy() implementation without a NULL pointer special case + * + * @param dst Destination buffer + * @param src Source buffer + * @param cnt Number of bytes to copy; must be >= 0 + */ +static inline void av_memcpy(void *dst, const void *src, size_t cnt) +{ + if (cnt) + memcpy(dst, src, cnt); +} + /** * @} */ diff --git a/libavutil/version.h b/libavutil/version.h index e16b93e877..24ca8ab7db 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 30 +#define LIBAVUTIL_VERSION_MINOR 31 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \