Changeset 3789

Timestamp:

Mar 22, 2012, 9:53:05 PM (13 years ago)

Author:

bird

Message:

ctype.h: Correctly fend of queries reading EOF (-1). Fixes #199.

Location:

branches/libc-0.6/src/emx

Files:

• include/_ctype.h (modified) (2 diffs)
• src/lib/locale/locale_ctype.c (modified) (1 diff)

branches/libc-0.6/src/emx/include/_ctype.h

@@ -166 +166 @@
 static __inline__ unsigned __ctype(__ct_rune_t __ch, unsigned __f)
 {
-    return __ch < 256 && __ch >= -128
+    return __ch < 256 && __ch >= -128 && __ch != -1 /*EOF*/
         ? __libc_GLocaleCtype.aufType[__ch & 0xff] & __f
         : 0;
@@ -178 +178 @@
 static __inline__ int __isctype(__ct_rune_t __ch, unsigned __f)
 {
-    return __ch <= 255 && __ch >= -128
+    return __ch <= 255 && __ch >= -128 && __ch != -1 /*EOF*/
         ? !!(__libc_GLocaleCtypeDefault.aufType[__ch & 0xff] & __f)
         : 0;

branches/libc-0.6/src/emx/src/lib/locale/locale_ctype.c

@@ -220 +220 @@
 unsigned __ctype(__ct_rune_t __ch, unsigned __f)
 {
-    return __ch <= 255 && __ch >= -128
+    return __ch <= 255 && __ch >= -128 && __ch != -1 /*EOF*/
         ? __libc_GLocaleCtype.aufType[__ch & 0xff] & __f
         : 0;