Bug fix from Robert de Bath: since lpDx_maybe is always supposed to

equal either lpDx or NULL, we mustn't forget to update it when we
realloc lpDx.

[originally from svn r9526]

diff --git a/windows/window.c b/windows/window.c
index 4425e191fcdf2f9b50d4035687f021b0b3c8024a..df69db14b0d79e5c511c5cb0ef8ee25fdb2e807d 100644 (file)
--- a/windows/window.c
+++ b/windows/window.c
@@ -3515,12 +3515,13 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
                 len += 2;
         }
 
-        if (len > lpDx_len) {
-            if (len > lpDx_len) {
-                lpDx_len = len * 9 / 8 + 16;
-                lpDx = sresize(lpDx, lpDx_len, int);
-            }
-        }
+       if (len > lpDx_len) {
+           lpDx_len = len * 9 / 8 + 16;
+           lpDx = sresize(lpDx, lpDx_len, int);
+
+           if (lpDx_maybe) lpDx_maybe = lpDx;
+       }
+
         {
             int i;
             /* only last char has dx width in SURROGATE PAIR and