comctl32/listview: Return earlier on allocation failure (Coverity).

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32/listview: Return earlier on allocation failure (Coverity).
622a2404 · Nikolay Sivov · Alexandre Julliard · 42cc080f · 622a2404
Commit 622a2404 authored Aug 04, 2016 by Nikolay Sivov Committed by Alexandre Julliard Aug 04, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

listview.c dlls/comctl32/listview.c +8 -6

No files found.
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -5863,13 +5863,15 @@ static BOOL LISTVIEW_EndEditLabelT(LISTVIEW_INFO *infoPtr, BOOL storeText, BOOL 
    {
        DWORD len = isW ? GetWindowTextLengthW(infoPtr->hwndEdit) : GetWindowTextLengthA(infoPtr->hwndEdit);

-        if (len)
+        if (len++)
        {
-            if ((pszText = Alloc((len+1) * (isW ? sizeof(WCHAR) : sizeof(CHAR)))))
-            {
-                if (isW) GetWindowTextW(infoPtr->hwndEdit, pszText, len+1);
-                else GetWindowTextA(infoPtr->hwndEdit, (CHAR*)pszText, len+1);
-            }
+            if (!(pszText = Alloc(len * (isW ? sizeof(WCHAR) : sizeof(CHAR)))))
+                return FALSE;
+
+            if (isW)
+                GetWindowTextW(infoPtr->hwndEdit, pszText, len);
+            else
+                GetWindowTextA(infoPtr->hwndEdit, (CHAR*)pszText, len);
        }
    }