From ce6902d37c18c60e18671ffb3975f674a2a72725 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 29 Mar 2013 23:02:58 +0100 Subject: [PATCH] Fixed String::GetWordPosition Former-commit-id: df701345b94a899f91d4f67d270b2da20c23e904 --- src/Nazara/Core/String.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Nazara/Core/String.cpp b/src/Nazara/Core/String.cpp index ce05d8e07..3c4e65280 100644 --- a/src/Nazara/Core/String.cpp +++ b/src/Nazara/Core/String.cpp @@ -2447,20 +2447,21 @@ unsigned int NzString::GetWordPosition(unsigned int index, nzUInt32 flags) const } else { - while (ptr != &m_sharedString->string[m_sharedString->size]) + do { - if (!std::isspace(*ptr++)) + if (std::isspace(*ptr)) + inWord = false; + else { if (!inWord) { inWord = true; if (++currentWord > index) - return ptr-m_sharedString->string; + return ptr - m_sharedString->string; } } - else - inWord = false; } + while (*++ptr); } return npos;