aboutsummaryrefslogtreecommitdiff
path: root/iconvdata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-07-25 05:13:02 +0000
committerUlrich Drepper <drepper@redhat.com>1999-07-25 05:13:02 +0000
commitbd805dba0ea2ad535e9ec2b4f53b9a61789f9cee (patch)
tree1badeb15db70ae0bbe4ad73f2e1dc616774cc322 /iconvdata
parent30f9ca19e07fa47e5e1252880d9ca4359ac2d92e (diff)
downloadglibc-bd805dba0ea2ad535e9ec2b4f53b9a61789f9cee.tar
glibc-bd805dba0ea2ad535e9ec2b4f53b9a61789f9cee.tar.gz
glibc-bd805dba0ea2ad535e9ec2b4f53b9a61789f9cee.tar.bz2
glibc-bd805dba0ea2ad535e9ec2b4f53b9a61789f9cee.zip
Update.
* iconvdata/ksc5601.h (ksc5601_to_ucs4): Avoid invalid memory accesses.
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/ksc5601.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/iconvdata/ksc5601.h b/iconvdata/ksc5601.h
index ebe3a825d8..e50d6d6c20 100644
--- a/iconvdata/ksc5601.h
+++ b/iconvdata/ksc5601.h
@@ -46,7 +46,7 @@ extern const struct map __ksc5601_hanja_from_ucs[KSC5601_HANJA];
static inline uint32_t
ksc5601_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
{
- unsigned char ch = *(*s);
+ unsigned char ch = **s;
unsigned char ch2;
int idx;
@@ -68,17 +68,19 @@ ksc5601_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
/* 1410 = 15 * 94 , 3760 = 40 * 94
Hangul in KS C 5601 : row 16 - row 40 */
- (*s) += 2;
+ *s += 2;
- if (idx >= 1410 && idx < 3760)
+ if (idx >= 1410 && idx < 1410 + KSC5601_HANGUL)
return (__ksc5601_hangul_to_ucs[idx - 1410]
?: ((*s) -= 2, __UNKNOWN_10646_CHAR));
else if (idx >= 3854)
/* Hanja : row 42 - row 93 : 3854 = 94 * (42-1) */
return (__ksc5601_hanja_to_ucs[idx - 3854]
?: ((*s) -= 2, __UNKNOWN_10646_CHAR));
- else
+ else if (idx <= 1114)
return __ksc5601_sym_to_ucs[idx] ?: ((*s) -= 2, __UNKNOWN_10646_CHAR);
+
+ return __UNKNOWN_10646_CHAR;
}
static inline size_t