comctl32[1/2]: toolbar: Str_SetPtr* assumes the destination pointer points to allocated memory or is NULL

Alexandre Julliard julliard at winehq.org
Tue Jan 27 08:48:55 CST 2009


Mikołaj Zalewski <mikolaj at zalewski.pl> writes:

> @@ -2924,6 +2925,7 @@ TOOLBAR_AddStringW (HWND hwnd, WPARAM wParam, LPARAM lParam)
>              }
>  
>              infoPtr->strings = ReAlloc(infoPtr->strings, sizeof(LPWSTR)*(infoPtr->nNumStrings+1));
> +            infoPtr->strings[infoPtr->nNumStrings] = NULL;
>              Str_SetPtrW(&infoPtr->strings[infoPtr->nNumStrings], p);
>              infoPtr->nNumStrings++;
>  
> @@ -2942,6 +2944,7 @@ TOOLBAR_AddStringW (HWND hwnd, WPARAM wParam, LPARAM lParam)
>  
>              TRACE("len=%d %s\n", len, debugstr_w(p));
>              infoPtr->strings = ReAlloc(infoPtr->strings, sizeof(LPWSTR)*(infoPtr->nNumStrings+1));
> +            infoPtr->strings[infoPtr->nNumStrings] = NULL;
>              Str_SetPtrW (&infoPtr->strings[infoPtr->nNumStrings], p);
>  	    infoPtr->nNumStrings++;

ReAlloc initializes to 0, so this shouldn't make any difference.

-- 
Alexandre Julliard
julliard at winehq.org



More information about the wine-devel mailing list