commit 71a8a74b43a3e6d145eaecce93e4aa62fe6ce81b
author Robert O'Callahan <robert@ocallahan.org> Sat Apr 27 00:14:16 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Apr 27 00:14:16 2002 +0000
tree 23745c14920d021236da62c83c92805078e4322a
parent 5769d1de000bcef6f54efb2e97449ec36b162e4b

Fixed bug in TEXT_WordBreak that was variously throwing Lotus Notes
into an infinite loop or causing it to crash.

dlls/user/text.c

diff --git a/dlls/user/text.c b/dlls/user/text.c
index b591ad8..0bae181 100644
--- a/dlls/user/text.c
+++ b/dlls/user/text.c
@@ -356,13 +356,15 @@
     /* If there was one or the first character didn't fit then */
     if (word_fits)
     {
+        int next_is_space;
         /* break the line before/after that character */
         if (!(format & (DT_RIGHT | DT_CENTER)) || *p != SPACE)
             p++;
+        next_is_space = (p - str) < *len_str && *p == SPACE;
         *len_str = p - str;
         /* and if the next character is a space then discard it. */
         *chars_used = *len_str;
-        if (*p == SPACE)
+        if (next_is_space)
             (*chars_used)++;
     }
     /* Suppose there was none. */