diff options
| author | artemp <artem@mapnik.org> | 2014-11-03 12:29:18 +0000 |
|---|---|---|
| committer | artemp <artem@mapnik.org> | 2014-11-03 12:29:18 +0000 |
| commit | 01f70f5db043cccdc4efdfd40ded68d7fea90853 (patch) | |
| tree | accaa652c9a8e1d3a2c4c0e2070d8fb11520199e /platform | |
| parent | 4a5d4ea0aa823871b504a9189d08667daf91b63c (diff) | |
| download | qtlocation-mapboxgl-01f70f5db043cccdc4efdfd40ded68d7fea90853.tar.gz | |
increase buf to hold trailing '\0' + better names
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/default/string_stdlib.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/default/string_stdlib.cpp b/platform/default/string_stdlib.cpp index a506c761e0..9639cd7b99 100644 --- a/platform/default/string_stdlib.cpp +++ b/platform/default/string_stdlib.cpp @@ -14,14 +14,14 @@ std::string uppercase(const std::string& str) boost::u8_to_u32_iterator<std::string::const_iterator> itr(str.begin()); boost::u8_to_u32_iterator<std::string::const_iterator> end(str.end()); std::string output; - char buf[4]; + char buf[5]; for (; itr!=end; ++itr) { char const* up = nu_toupper(*itr); if (up != 0) output.append(up); else { - std::memset(buf, 0, 4); + std::memset(buf, 0, 5); nu_utf8_write(*itr, buf); output.append(buf); } @@ -34,14 +34,14 @@ std::string lowercase(const std::string& str) boost::u8_to_u32_iterator<std::string::const_iterator> itr(str.begin()); boost::u8_to_u32_iterator<std::string::const_iterator> end(str.end()); std::string output; - char buf[4]; + char buf[5]; for (; itr!=end; ++itr) { - char const* up = nu_tolower(*itr); - if (up != 0) output.append(up); + char const* lo = nu_tolower(*itr); + if (lo != 0) output.append(lo); else { - std::memset(buf, 0, 4); + std::memset(buf, 0, 5); nu_utf8_write(*itr, buf); output.append(buf); } |