From 3ba99d8a035e95aa93eb2fc56739f63c36582213 Mon Sep 17 00:00:00 2001
From: Ilya Enkovich <ilya.enkovich@intel.com>
Date: Thu, 9 Apr 2015 10:11:30 +0000
Subject: [PATCH] mpx_wrappers.c (__mpx_wrapper_memmove): Add zero length
 check.

libmpx/

	* mpxwrap/mpx_wrappers.c (__mpx_wrapper_memmove): Add
	zero length check.

gcc/testsuite/

	* gcc.target/i386/mpx/memmove-zero-length.c: New.

From-SVN: r221944
---
 gcc/testsuite/ChangeLog                                |  4 ++++
 .../gcc.target/i386/mpx/memmove-zero-length.c          | 18 ++++++++++++++++++
 libmpx/ChangeLog                                       |  5 +++++
 libmpx/mpxwrap/mpx_wrappers.c                          |  3 +++
 4 files changed, 30 insertions(+)
 create mode 100644 gcc/testsuite/gcc.target/i386/mpx/memmove-zero-length.c

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1cd869a..90e467a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-09  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+	* gcc.target/i386/mpx/memmove-zero-length.c: New.
+
 2015-04-09  Kirill Yukhin  <kirill.yukhin@intel.com>
 
 	PR target/65676
diff --git a/gcc/testsuite/gcc.target/i386/mpx/memmove-zero-length.c b/gcc/testsuite/gcc.target/i386/mpx/memmove-zero-length.c
new file mode 100644
index 0000000..78bfdeb
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/mpx/memmove-zero-length.c
@@ -0,0 +1,18 @@
+/* { dg-do run } */
+/* { dg-options "-fcheck-pointer-bounds -mmpx" } */
+
+
+#include "mpx-check.h"
+#include "string.h"
+
+int mpx_test (int argc, const char **argv)
+{
+  int *buf = (int *)malloc (100 * sizeof(int));
+
+  memmove (buf, NULL, 0);
+  memmove (NULL, buf, 0);
+
+  free (buf);
+
+  return 0;
+}
diff --git a/libmpx/ChangeLog b/libmpx/ChangeLog
index 6b05278..56c3c5f 100644
--- a/libmpx/ChangeLog
+++ b/libmpx/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-09  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+	* mpxwrap/mpx_wrappers.c (__mpx_wrapper_memmove): Add
+	zero length check.
+
 2015-04-02  Ilya Enkovich  <ilya.enkovich@intel.com>
 
 	PR driver/65444
diff --git a/libmpx/mpxwrap/mpx_wrappers.c b/libmpx/mpxwrap/mpx_wrappers.c
index ef4be8d..58670aa 100644
--- a/libmpx/mpxwrap/mpx_wrappers.c
+++ b/libmpx/mpxwrap/mpx_wrappers.c
@@ -97,6 +97,9 @@ __mpx_wrapper_memmove (void *dst, const void *src, size_t n)
   size_t offset_src = ((size_t) s) & (sizeof (void *) - 1);
   size_t offset_dst = ((size_t) d) & (sizeof (void *) - 1);
 
+  if (n == 0)
+    return ret;
+
   __bnd_chk_ptr_bounds (dst, n);
   __bnd_chk_ptr_bounds (src, n);
 
-- 
2.7.4