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
514951cc
Commit
514951cc
authored
Jan 19, 2015
by
Michael Stefaniuc
Committed by
Alexandre Julliard
Jan 19, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ole32: Return the buffer pointer when WdtpInterfacePointer_UserMarshal fails.
Found by PVS-Studio.
parent
139ebf64
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
usrmarshal.c
dlls/ole32/tests/usrmarshal.c
+1
-0
usrmarshal.c
dlls/ole32/usrmarshal.c
+1
-1
No files found.
dlls/ole32/tests/usrmarshal.c
View file @
514951cc
...
...
@@ -576,6 +576,7 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx)
ok
(
size
==
0
,
"size should be 0 bytes, not %d
\n
"
,
size
);
buffer
=
HeapAlloc
(
GetProcessHeap
(),
0
,
size
);
buffer_end
=
WdtpInterfacePointer_UserMarshal
(
&
umcb
.
Flags
,
ctx
,
buffer
,
unk
,
&
IID_IUnknown
);
ok
(
buffer_end
==
buffer
,
"buffer_end %p buffer %p
\n
"
,
buffer_end
,
buffer
);
HeapFree
(
GetProcessHeap
(),
0
,
buffer
);
/* Now for a non-NULL pointer. The marshalled data are two size DWORDS and then
...
...
dlls/ole32/usrmarshal.c
View file @
514951cc
...
...
@@ -1641,7 +1641,7 @@ unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG Rea
if
(
CoMarshalInterface
(
stm
,
riid
,
punk
,
LOWORD
(
RealFlags
),
NULL
,
MSHLFLAGS_NORMAL
)
!=
S_OK
)
{
IStream_Release
(
stm
);
return
NULL
;
return
pBuffer
;
}
ALIGN_POINTER
(
pBuffer
,
3
);
...
...
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