commit f9340ff94d08800b7aa8d652b343ce413722c079
author Duane Clark <dclark@akamail.com> Wed Mar 20 01:31:03 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Mar 20 01:31:03 2002 +0000
tree 709092c393a363e09bf7653888e96fac54a29ea3
parent b4994d18e94c8703a54fa31e19859d798d48d52e

On WM_GETTEXT, terminate the lparam buffer even if string is empty.

windows/defwnd.c

diff --git a/windows/defwnd.c b/windows/defwnd.c
index 232a16f..99a8980 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -794,15 +794,19 @@
         break;
 
     case WM_GETTEXT:
+        if (wParam)
         {
+            LPSTR dest = (LPSTR)lParam;
             WND *wndPtr = WIN_GetPtr( hwnd );
-            if (wParam && wndPtr && wndPtr->text)
+
+            if (!wndPtr) break;
+            if (wndPtr->text)
             {
-                LPSTR dest = (LPSTR)lParam;
                 if (!WideCharToMultiByte( CP_ACP, 0, wndPtr->text, -1,
                                           dest, wParam, NULL, NULL )) dest[wParam-1] = 0;
                 result = strlen( dest );
             }
+            else dest[0] = '\0';
             WIN_ReleasePtr( wndPtr );
         }
         break;
@@ -928,14 +932,18 @@
         break;
 
     case WM_GETTEXT:
+        if (wParam)
         {
+            LPWSTR dest = (LPWSTR)lParam;
             WND *wndPtr = WIN_GetPtr( hwnd );
-            if (wParam && wndPtr && wndPtr->text)
+
+            if (!wndPtr) break;
+            if (wndPtr->text)
             {
-                LPWSTR dest = (LPWSTR)lParam;
                 lstrcpynW( dest, wndPtr->text, wParam );
                 result = strlenW( dest );
             }
+            else dest[0] = '\0';
             WIN_ReleasePtr( wndPtr );
         }
         break;