Merge branch 'pre-0.64'

[PuTTY.git] / unix / uxucs.c

diff --git a/unix/uxucs.c b/unix/uxucs.c
index 8cd300d328aaad55f6ad4b789e119063a54d49c3..5d3d5af0924a7caeea823fcf27f058ca73fc3161 100644 (file)
--- a/unix/uxucs.c
+++ b/unix/uxucs.c
@@ -265,7 +265,7 @@ const char *cp_enumerate(int index)
 
 int decode_codepage(char *cp_name)
 {
-    if (!*cp_name)
+    if (!cp_name || !*cp_name)
        return CS_UTF8;
     return charset_from_localenc(cp_name);
 }