X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fi18n.c;h=1cc518ff3cb363f4930c800a55b737bf317e49b3;hb=173d1687aea88e0e5e1b1d8615ed68ebefb15d08;hp=8e99aa04236cb1cf7cd326848b20461f4ceb2e7d;hpb=26c0db0a90c83201a90583e2b9afa3c11f08ec2d;p=pspp

diff --git a/src/libpspp/i18n.c b/src/libpspp/i18n.c
index 8e99aa0423..1cc518ff3c 100644
--- a/src/libpspp/i18n.c
+++ b/src/libpspp/i18n.c
@@ -42,9 +42,9 @@
 #endif
 
 struct converter
-  {
-    const char *tocode;
-    const char *fromcode;
+ {
+    char *tocode;
+    char *fromcode;
     iconv_t conv;
   };
 
@@ -79,7 +79,7 @@ create_iconv (const char* tocode, const char* fromcode)
       const int err = errno;
       fprintf (stderr,
                "Warning: "
-               "cannot create a converter for \"%s\" to \"%s\": %s\n",
+               "cannot create a converter for `%s' to `%s': %s\n",
                fromcode, tocode, strerror (err));
     }
 
@@ -177,7 +177,7 @@ recode_string_pool (const char *to, const char *from,
 	      }
 	    /* Fall through */
 	  case E2BIG:
-	    free (outbuf);
+	    pool_free (pool, outbuf);
 	    outbufferlength <<= 1;
 	    outbuf = pool_malloc (pool, outbufferlength);
 	    op = outbuf;
@@ -291,8 +291,11 @@ i18n_done (void)
 {
   struct hmapx_node *node;
   struct converter *cvtr;
+
   HMAPX_FOR_EACH (cvtr, node, &map)
     {
+      free (cvtr->tocode);
+      free (cvtr->fromcode);
       iconv_close (cvtr->conv);
       free (cvtr);
     }