about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--NEWS2
-rw-r--r--sysdeps/i386/i686/memmove.S4
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b19405fd2..661f004cba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-08  Yuriy Kaminskiy  <yumkam@gmail.com>
+	    Maxim Kuvyrkov  <maxim@kugelworks.com>
+
+	[BZ #16394]
+        * sysdeps/i386/i686/memmove.S (memmove): Compare distance between
+        SRC and DEST against LEN.
+
 2014-01-08  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	[BZ #16414]
diff --git a/NEWS b/NEWS
index 4fe23146fc..2a936f586b 100644
--- a/NEWS
+++ b/NEWS
@@ -24,7 +24,7 @@ Version 2.19
   16103, 16112, 16143, 16144, 16146, 16150, 16151, 16153, 16167, 16172,
   16195, 16214, 16245, 16271, 16274, 16283, 16289, 16293, 16314, 16316,
   16330, 16337, 16338, 16356, 16365, 16366, 16369, 16372, 16375, 16379,
-  16384, 16385, 16386, 16387, 16390, 16400, 16407, 16408, 16414.
+  16384, 16385, 16386, 16387, 16390, 16394, 16400, 16407, 16408, 16414.
 
 * Slovenian translations for glibc messages have been contributed by the
   Translation Project's Slovenian team of translators.
diff --git a/sysdeps/i386/i686/memmove.S b/sysdeps/i386/i686/memmove.S
index d9017388f9..4b8785f22c 100644
--- a/sysdeps/i386/i686/memmove.S
+++ b/sysdeps/i386/i686/memmove.S
@@ -58,8 +58,8 @@ ENTRY (memmove)
 
 	movl	%edi, %eax
 	subl	%esi, %eax
-	cmpl	%eax, %edi
-	jae	3f
+	cmpl	%eax, %ecx
+	ja	3f
 
 	cld
 	shrl	$1, %ecx