diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 13:07:31 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-18 13:07:31 +0200 |
| commit | 4ec2e9d7eda78d409d1b017ef4d8928fe9055438 (patch) | |
| tree | 6c3a74a740d3c1c5f3a7d1f8154d8a791b435b3f /strings/ctype-utf8.c | |
| parent | 1a2a9d74fe1256554eceb09bbc6752a6376df87d (diff) | |
| parent | 197bdbae4db78ba65f3668803bebd3c4a4509ae5 (diff) | |
| download | mariadb-git-4ec2e9d7eda78d409d1b017ef4d8928fe9055438.tar.gz | |
5.5 merge and fixes for compiler/test errors
Diffstat (limited to 'strings/ctype-utf8.c')
| -rw-r--r-- | strings/ctype-utf8.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index b17840bd54c..c3dc0da8797 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. - Copyright (c) 2009, 2011, Monty Program Ab +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. + Copyright (c) 2009, 2013, Monty Program Ab This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -4379,7 +4379,9 @@ my_mb_wc_filename(CHARSET_INFO *cs __attribute__((unused)), return MY_CS_TOOSMALL3; byte1= s[1]; - byte2= byte1 ? s[2] : 0; + if (byte1 == 0) + return MY_CS_ILSEQ; /* avoid possible out-of-bounds read */ + byte2= s[2]; if (byte1 >= 0x30 && byte1 <= 0x7F && byte2 >= 0x30 && byte2 <= 0x7F) |