From: Yuriy Kaminskiy <yumkam@gmail.com>
Date: Wed, 8 Jan 2014 20:49:54 +0000 (+1300)
Subject: Fix a thinko/typo in i686's memmove (aka __memmove_ia32).
X-Git-Tag: glibc-2.19~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66671c84d58d6ae705bac39dc476c3d3b2b81116;p=thirdparty%2Fglibc.git

Fix a thinko/typo in i686's memmove (aka __memmove_ia32).

	* sysdeps/i386/i686/memmove.S (memmove): Compare distance between
	SRC and DEST against LEN.
---

diff --git a/ChangeLog b/ChangeLog
index 1b19405fd2a..661f004cba4 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 4fe23146fc1..2a936f586bc 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 d9017388f90..4b8785f22cf 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