X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=charset%2Fmacenc.c;h=428e3dca0f9d0828452eeccba1e751816c258f1a;hb=15f1bc7cdb1e7c651a1c729aa9474f5844c8a284;hp=431056331ae0f1f8260b45d7587e3b4c9cac84e8;hpb=0ea7e350080f1563e99197f42bb37f7508e7b99b;p=PuTTY.git

diff --git a/charset/macenc.c b/charset/macenc.c
index 43105633..428e3dca 100644
--- a/charset/macenc.c
+++ b/charset/macenc.c
@@ -1,4 +1,4 @@
-/* $Id: macenc.c,v 1.1 2003/01/01 19:51:12 ben Exp $ */
+/* $Id$ */
 /*
  * Copyright (c) 2003 Ben Harris
  * All rights reserved.
@@ -162,7 +162,7 @@ int charset_from_macenc(int script, int region, int sysvers,
 	    (macencs[i].region < 0 || macencs[i].region == region) &&
 	    (macencs[i].sysvermin <= sysvers) &&
 	    (macencs[i].fontname == NULL ||
-	     strcmp(macencs[i].fontname, fontname) == 0))
+	     (fontname != NULL && strcmp(macencs[i].fontname, fontname) == 0)))
 	    return macencs[i].charset;
 
     return CS_NONE;