From 71fefd86ac7e2328ad11a8a3a49452a2e65b186b Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 31 May 2009 13:00:51 +0000
Subject: Use a malloced string for the get_term_charset return value. This is
 necessary at least on POSIX systems since the buffer returned by nl_langinfo
 may change its contents with e.g. each setlocale call.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29332 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 osdep/getch2-os2.c | 3 ++-
 osdep/getch2-win.c | 7 ++++---
 osdep/getch2.c     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'osdep')

diff --git a/osdep/getch2-os2.c b/osdep/getch2-os2.c
index abb7f2e6ac..272d2d45e9 100644
--- a/osdep/getch2-os2.c
+++ b/osdep/getch2-os2.c
@@ -26,6 +26,7 @@
 #include <os2.h>
 
 #include <stdio.h>
+#include <string.h>
 
 #include "config.h"
 #include "keycodes.h"
@@ -189,7 +190,7 @@ char *get_term_charset( void )
 
 #ifdef HAVE_LANGINFO
     setlocale( LC_CTYPE, "");
-    charset = nl_langinfo( CODESET );
+    charset = strdup( nl_langinfo( CODESET ));
     setlocale( LC_CTYPE, "C");
 #endif
 
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index b201a9d6df..3c428834ff 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -25,6 +25,7 @@
 
 #include "config.h"
 #include <stdio.h>
+#include <string.h>
 #include <windows.h>
 #include "keycodes.h"
 #include "input/input.h"
@@ -187,7 +188,7 @@ static const struct {
 
 char* get_term_charset(void)
 {
-    static char codepage[10];
+    char codepage[10];
     unsigned i, cpno = GetConsoleOutputCP();
     if (!cpno)
         cpno = GetACP();
@@ -196,9 +197,9 @@ char* get_term_charset(void)
 
     for (i = 0; cp_alias[i].cp; i++)
         if (cpno == cp_alias[i].cp)
-            return cp_alias[i].alias;
+            return strdup(cp_alias[i].alias);
 
     snprintf(codepage, sizeof(codepage), "CP%u", cpno);
-    return codepage;
+    return strdup(codepage);
 }
 #endif
diff --git a/osdep/getch2.c b/osdep/getch2.c
index 2283bed648..4a591da2db 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -297,7 +297,7 @@ char* get_term_charset(void)
     char* charset = NULL;
 #ifdef HAVE_LANGINFO
     setlocale(LC_CTYPE, "");
-    charset = nl_langinfo(CODESET);
+    charset = strdup(nl_langinfo(CODESET));
     setlocale(LC_CTYPE, "C");
 #endif
     return charset;
-- 
cgit v1.2.3