1 files changed, 6 insertions, 5 deletions
diff --git a/mysys/my_tempnam.c b/mysys/my_tempnam.c
index 4cf483d22cf..b4f76727ee0 100644
--- a/mysys/my_tempnam.c
+++ b/mysys/my_tempnam.c
@@ -105,12 +105,13 @@ my_string my_tempnam(const char *dir, const char *pfx,
   }
 #ifdef OS2
   /* changing environ variable doesn't work with VACPP */
-  char  buffer[256];
-  strxnmov(buffer, sizeof(buffer), "TMP=", dir);
+  char  buffer[256], *end;
+  buffer[sizeof[buffer)-1]= 0;
+  end= strxnmov(buffer, sizeof(buffer)-1, (char*) "TMP=", dir, NullS);
   /* remove ending backslash */
-  if (buffer[strlen(buffer)-1] == '\\')
-     buffer[strlen(buffer)-1] = '\0';
-  putenv( buffer);
+  if (end[-1] == '\\')
+    end[-1]= 0;
+  putenv(buffer);
 #elif !defined(__NETWARE__)
   old_env=(char**)environ;
   if (dir)