aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-02-15 17:24:19 -0500
committerGitHub <noreply@github.com>2018-02-15 17:24:19 -0500
commit3f0cf6b62ad1eb50d8736538363d3580dd640c3e (patch)
tree6ce042f8e522b0e599e2d4aceae2892dde92c4ee
parent42140509b6fc2337f8cffe913f6ce1dbf489513b (diff)
parent8dd1eb5984fbc7ad5ede19a34f6c29d48a945e5f (diff)
downloadgoogletest-3f0cf6b62ad1eb50d8736538363d3580dd640c3e.tar.gz
googletest-3f0cf6b62ad1eb50d8736538363d3580dd640c3e.tar.bz2
googletest-3f0cf6b62ad1eb50d8736538363d3580dd640c3e.zip
Merge pull request #1450 from pwnall/fix-printers
Fix std::iscntrl use in gtest-printers.cc
-rw-r--r--googletest/src/gtest-printers.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/googletest/src/gtest-printers.cc b/googletest/src/gtest-printers.cc
index fe70edcf..d55a5e9b 100644
--- a/googletest/src/gtest-printers.cc
+++ b/googletest/src/gtest-printers.cc
@@ -357,8 +357,10 @@ void PrintTo(const wchar_t* s, ostream* os) {
namespace {
bool ContainsUnprintableControlCodes(const char* str, size_t length) {
+ const unsigned char *s = reinterpret_cast<const unsigned char *>(str);
+
for (size_t i = 0; i < length; i++) {
- char ch = *str++;
+ unsigned char ch = *s++;
if (std::iscntrl(ch)) {
switch (ch) {
case '\t':