ubsan: nds32: left shift cannot be represented in type 'int'

[deliverable/binutils-gdb.git] / gdb / charset.c

diff --git a/gdb/charset.c b/gdb/charset.c
index 73131651a6dbb652d925400a22d605353dcf51fd..a93fe99c41fa78a54550548e346966d73c474480 100644 (file)
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -23,7 +23,6 @@
 #include "gdb_obstack.h"
 #include "gdbsupport/gdb_wait.h"
 #include "charset-list.h"
-#include "gdbsupport/vec.h"
 #include "gdbsupport/environ.h"
 #include "arch-utils.h"
 #include "gdbsupport/gdb_vecs.h"
@@ -817,10 +816,9 @@ find_charset_names (void)
 
 #ifdef ICONV_BIN
   {
-    char *iconv_dir = relocate_gdb_directory (ICONV_BIN,
-                                             ICONV_BIN_RELOCATABLE);
-    iconv_program = concat (iconv_dir, SLASH_STRING, "iconv", NULL);
-    xfree (iconv_dir);
+    std::string iconv_dir = relocate_gdb_directory (ICONV_BIN,
+                                                   ICONV_BIN_RELOCATABLE);
+    iconv_program = concat (iconv_dir.c_str(), SLASH_STRING, "iconv", NULL);
   }
 #else
   iconv_program = xstrdup ("iconv");