Corrected a potential crash.
This commit is contained in:
parent
7e85ea7c86
commit
c69c954783
|
@ -1809,13 +1809,15 @@ TOOLBAR_GetButtonInfoA (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
lpTbInfo->fsState = btnPtr->fsState;
|
lpTbInfo->fsState = btnPtr->fsState;
|
||||||
if (lpTbInfo->dwMask & TBIF_STYLE)
|
if (lpTbInfo->dwMask & TBIF_STYLE)
|
||||||
lpTbInfo->fsStyle = btnPtr->fsStyle;
|
lpTbInfo->fsStyle = btnPtr->fsStyle;
|
||||||
if (lpTbInfo->dwMask & TBIF_TEXT) {
|
if (lpTbInfo->dwMask & TBIF_TEXT) {
|
||||||
if ((btnPtr->iString >= 0) || (btnPtr->iString < infoPtr->nNumStrings))
|
if ((btnPtr->iString >= 0) && (btnPtr->iString < infoPtr->nNumStrings))
|
||||||
lstrcpynWtoA (lpTbInfo->pszText,
|
{
|
||||||
(LPWSTR)infoPtr->strings[btnPtr->iString],
|
lstrcpynWtoA (lpTbInfo->pszText,
|
||||||
lpTbInfo->cchText);
|
(LPWSTR)infoPtr->strings[btnPtr->iString],
|
||||||
|
lpTbInfo->cchText);
|
||||||
|
}
|
||||||
|
else lpTbInfo->pszText[0]=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return nIndex;
|
return nIndex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue