Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
ae3b3346
Commit
ae3b3346
authored
Nov 28, 2019
by
Nikolay Sivov
Committed by
Alexandre Julliard
Nov 28, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comctl32/toolbar: Handle NULL string pointer from TBN_GETINFOTIPW.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
27eee2d9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
toolbar.c
dlls/comctl32/tests/toolbar.c
+4
-0
toolbar.c
dlls/comctl32/toolbar.c
+1
-1
No files found.
dlls/comctl32/tests/toolbar.c
View file @
ae3b3346
...
...
@@ -159,6 +159,7 @@ static LRESULT parent_wnd_notify(LPARAM lParam)
break
;
case
TBN_GETINFOTIPA
:
case
TBN_GETINFOTIPW
:
{
NMTBGETINFOTIPA
*
tbgit
=
(
NMTBGETINFOTIPA
*
)
lParam
;
...
...
@@ -2029,6 +2030,9 @@ static void test_tooltip(void)
g_ResetDispTextPtr
=
TRUE
;
SendMessageA
(
hToolbar
,
WM_NOTIFY
,
0
,
(
LPARAM
)
&
nmtti
);
/* Same for TBN_GETINFOTIPW */
SendMessageA
(
hToolbar
,
TB_SETUNICODEFORMAT
,
TRUE
,
0
);
SendMessageA
(
hToolbar
,
WM_NOTIFY
,
0
,
(
LPARAM
)
&
nmtti
);
g_ResetDispTextPtr
=
FALSE
;
DestroyWindow
(
hToolbar
);
...
...
dlls/comctl32/toolbar.c
View file @
ae3b3346
...
...
@@ -6149,7 +6149,7 @@ static LRESULT TOOLBAR_TTGetDispInfo (TOOLBAR_INFO *infoPtr, NMTTDISPINFOW *lpnm
TRACE
(
"TBN_GETINFOTIPW - got string %s
\n
"
,
debugstr_w
(
tbgit
.
pszText
));
len
=
lstrlenW
(
tbgit
.
pszText
)
;
len
=
tbgit
.
pszText
?
lstrlenW
(
tbgit
.
pszText
)
:
0
;
if
(
len
>
ARRAY_SIZE
(
lpnmtdi
->
szText
)
-
1
)
{
/* need to allocate temporary buffer in infoPtr as there
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment