unistr/u*-stpncpy: Fix the return value.

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/unistr/u-stpncpy.h b/lib/unistr/u-stpncpy.h
index 335a8519d8..4d6dd3c701 100644
--- a/lib/unistr/u-stpncpy.h
+++ b/lib/unistr/u-stpncpy.h
@@ -23,8 +23,12 @@ FUNC (UNIT *dest, const UNIT *src, size_t n)
 
   /* This behavior is rarely useful, but it is here for consistency with
      strncpy and wcsncpy.  */
-  for (; n > 0; n--)
-    *dest++ = 0;
+  {
+    UNIT *destptr = dest;
 
-  return dest - 1;
+    for (; n > 0; n--)
+      *destptr++ = 0;
+  }
+
+  return dest;
 }