X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fu8-istream.c;h=2486ca1ada31c53966e556dfc9932f4ace47a3be;hb=d7a8159acf53f6bf70940d711b32348b6ae75f16;hp=22135dbb3381f08ed3f3c70440df99b1d1521dcb;hpb=0697a4277a80981c438518e844ae8174ea9b8453;p=pspp

diff --git a/src/libpspp/u8-istream.c b/src/libpspp/u8-istream.c
index 22135dbb33..2486ca1ada 100644
--- a/src/libpspp/u8-istream.c
+++ b/src/libpspp/u8-istream.c
@@ -134,12 +134,14 @@ u8_istream_for_fd (const char *fromcode, int fd)
     {
       if (encoding_guess_encoding_is_auto (fromcode)
           && !strcmp (encoding, "ASCII"))
-        is->state = S_AUTO;
+        {
+          is->state = S_AUTO;
+          encoding = encoding_guess_parse_encoding (fromcode);
+        }
       else
         is->state = S_CONVERT;
 
-      is->converter = iconv_open ("UTF-8",
-                                  encoding_guess_parse_encoding (fromcode));
+      is->converter = iconv_open ("UTF-8", encoding);
       if (is->converter == (iconv_t) -1)
         goto error;
     }