From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 4 Jun 2006 04:35:55 +0000 (+0000)
Subject: [BZ #2703]
X-Git-Tag: cvs/fedora-glibc-20060630T0858~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdc02996d41d0b74e45e29c97c9d8cd02a8cb9f7;p=thirdparty%2Fglibc.git

[BZ #2703]

2006-06-02  Ryan S. Arnold  <rsa@us.ibm.com>
	[BZ #2703]
	* string/envz.c (envz_strip): Correct erroneously reversed src
	and dest parameters to memmove() invocation.
---

diff --git a/ChangeLog b/ChangeLog
index 0fca57dc904..c299adc3e3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-02  Ryan S. Arnold  <rsa@us.ibm.com>
+
+	[BZ #2703]
+	* string/envz.c (envz_strip): Correct erroneously reversed src
+	and dest parameters to memmove() invocation.
+
 2006-05-30  Jakub Jelinek  <jakub@redhat.com>
 
 	* nscd/nscd.h (prune_cache): Add fd argument to prototype.
diff --git a/string/envz.c b/string/envz.c
index 5c5804c12bf..a9d420212fc 100644
--- a/string/envz.c
+++ b/string/envz.c
@@ -1,5 +1,5 @@
 /* Routines for dealing with '\0' separated environment vectors
-   Copyright (C) 1995,96,97,98,2001,02 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998,2001,2002,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Miles Bader <miles@gnu.org>
 
@@ -165,7 +165,7 @@ envz_strip (char **envz, size_t *envz_len)
       left -= entry_len;
       if (! strchr (entry, SEP))
 	/* Null entry. */
-	memmove (entry + entry_len, entry, left);
+	memmove (entry, entry + entry_len, left);
       else
 	entry += entry_len;
     }