[gs-commits] rev 11751 - trunk/gs/psi

[alexcher at ghostscript.com]

Author: alexcher
Date: 2010-10-03 16:13:00 +0000 (Sun, 03 Oct 2010)
New Revision: 11751

Modified:
   trunk/gs/psi/zfont2.c
Log:
Change the order of operands in a logical expression to avoid dereferencing
an uninitialized variable. Bug 690214.


Modified: trunk/gs/psi/zfont2.c
===================================================================
--- trunk/gs/psi/zfont2.c	2010-10-01 19:36:06 UTC (rev 11750)
+++ trunk/gs/psi/zfont2.c	2010-10-03 16:13:00 UTC (rev 11751)
@@ -2306,7 +2306,6 @@
                 return code;
         }
     }
-  done:
     return 0;
 }
 
@@ -2629,7 +2628,7 @@
                 encoding.value.refs[gid2char[gid]] = name;
             }     
         }
-        if ((enc_format & 0x80) && offsets.encoding_off > 1) {
+        if (offsets.encoding_off > 1 && (enc_format & 0x80)) {
             unsigned int n_supp, charcode, sid;
 
             if ((code = card8(&n_supp, data, supp_enc_offset, pe_all)) < 0)