commit c69c9547837e03acd3acd2b287e868a23dad3f37
author Michael Cardenas <michael_cardenas@deneba.com> Sun Jun 04 01:46:27 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Jun 04 01:46:27 2000 +0000
tree 793966d6296f0c4fc74e55b40f4ba1c0186644e2
parent 7e85ea7c8665b6f7b8e87e5804698767382b7794

Corrected a potential crash.

dlls/comctl32/toolbar.c

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index f5062df..806d8b3 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -1809,13 +1809,15 @@
 	lpTbInfo->fsState = btnPtr->fsState;
     if (lpTbInfo->dwMask & TBIF_STYLE)
 	lpTbInfo->fsStyle = btnPtr->fsStyle;
-    if (lpTbInfo->dwMask & TBIF_TEXT) {
-	if ((btnPtr->iString >= 0) || (btnPtr->iString < infoPtr->nNumStrings))
-	    lstrcpynWtoA (lpTbInfo->pszText,
-			  (LPWSTR)infoPtr->strings[btnPtr->iString],
-			 lpTbInfo->cchText);
+     if (lpTbInfo->dwMask & TBIF_TEXT) {
+         if ((btnPtr->iString >= 0) && (btnPtr->iString < infoPtr->nNumStrings))
+         {	
+             lstrcpynWtoA (lpTbInfo->pszText,
+                           (LPWSTR)infoPtr->strings[btnPtr->iString],
+                           lpTbInfo->cchText);
+         }
+         else lpTbInfo->pszText[0]=0;
     }
-
     return nIndex;
 }