Changeset 13888 in vbox for trunk/src/libs/xpcom18a4/xpcom

Timestamp:

Nov 5, 2008 7:29:12 PM (16 years ago)

Author:

vboxsync

Message:

warning

File:

• trunk/src/libs/xpcom18a4/xpcom/string/src/nsReadableUtils.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/xpcom/string/src/nsReadableUtils.cpp

@@ -591 +591 @@
 
                   // non-character : EF BF [BE-BF] or F[0-7] [89AB]F BF [BE-BF]
-                  if ( nonchar &&  ( !state &&  c < 0xBE ||
-                       state == 1 && c != 0xBF  ||
-                       state == 2 && 0x0F != (0x0F & c) ))
+                  if ( nonchar &&  ( (!state &&  c < 0xBE) ||
+                       (state == 1 && c != 0xBF)  ||
+                       (state == 2 && 0x0F != (0x0F & c)) ))
                      nonchar = PR_FALSE;
 
-                  if ( !UTF8traits::isInSeq(c) || overlong && c <= olupper || 
-                       surrogate && slower <= c || nonchar && !state )
+                  if ( !UTF8traits::isInSeq(c) || (overlong && c <= olupper) || 
+                       (surrogate && slower <= c) || (nonchar && !state) )
                     return PR_FALSE; // Not UTF-8 string
                   overlong = surrogate = PR_FALSE;