summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-04-26 17:57:19 +0300
committerunknown <monty@mashka.mysql.fi>2003-04-26 17:57:19 +0300
commit418467e32ad8617c1546870f1b24493601ca4d47 (patch)
tree620af8009183ab2c64bddf5c837907ba601ad4ee /mysys
parent963d57a39446490ce2fb91c773ac2466c3723aa1 (diff)
downloadmariadb-git-418467e32ad8617c1546870f1b24493601ca4d47.tar.gz
Fix possible memory overrun when reading broken character set files
sql/mysqld.cc: Safety fix.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/charset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/charset.c b/mysys/charset.c
index 9d9ede2b0c4..4cd32e7e3da 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -85,7 +85,7 @@ static my_bool get_word(struct simpleconfig_buf_st *fb, char *buf)
endptr = fb->buf;
}
- while (!isspace(*endptr))
+ while (*endptr && !isspace(*endptr))
*buf++= *endptr++;
*buf=0;
fb->p = endptr;