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
410302d8
Commit
410302d8
authored
Sep 21, 2008
by
Detlef Riekenberg
Committed by
Alexandre Julliard
Sep 23, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oleaut32: Remove redundant NULL check before SysFreeString.
parent
700b5c6d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
41 deletions
+20
-41
tmarshal.c
dlls/oleaut32/tmarshal.c
+3
-3
typelib.c
dlls/oleaut32/typelib.c
+17
-38
No files found.
dlls/oleaut32/tmarshal.c
View file @
410302d8
...
...
@@ -1420,8 +1420,8 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */)
TRACE_
(
olerelay
)(
"("
);
}
if
(
iname
)
SysFreeString
(
iname
);
if
(
fname
)
SysFreeString
(
fname
);
SysFreeString
(
iname
);
SysFreeString
(
fname
);
memset
(
&
buf
,
0
,
sizeof
(
buf
));
...
...
@@ -2080,7 +2080,7 @@ TMStubImpl_Invoke(
goto
exit
;
}
if
(
iname
)
SysFreeString
(
iname
);
SysFreeString
(
iname
);
/* Need them for hack below */
memset
(
names
,
0
,
sizeof
(
names
));
...
...
dlls/oleaut32/typelib.c
View file @
410302d8
...
...
@@ -838,7 +838,7 @@ enddeleteloop:
}
end
:
if
(
tlibPath
)
SysFreeString
(
tlibPath
);
SysFreeString
(
tlibPath
);
if
(
typeLib
)
ITypeLib_Release
(
typeLib
);
if
(
subKey
)
RegCloseKey
(
subKey
);
if
(
key
)
RegCloseKey
(
key
);
...
...
@@ -3833,29 +3833,17 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface)
}
TRACE
(
" destroying ITypeLib(%p)
\n
"
,
This
);
if
(
This
->
Name
)
{
SysFreeString
(
This
->
Name
);
This
->
Name
=
NULL
;
}
SysFreeString
(
This
->
Name
);
This
->
Name
=
NULL
;
if
(
This
->
DocString
)
{
SysFreeString
(
This
->
DocString
);
This
->
DocString
=
NULL
;
}
SysFreeString
(
This
->
DocString
);
This
->
DocString
=
NULL
;
if
(
This
->
HelpFile
)
{
SysFreeString
(
This
->
HelpFile
);
This
->
HelpFile
=
NULL
;
}
SysFreeString
(
This
->
HelpFile
);
This
->
HelpFile
=
NULL
;
if
(
This
->
HelpStringDll
)
{
SysFreeString
(
This
->
HelpStringDll
);
This
->
HelpStringDll
=
NULL
;
}
SysFreeString
(
This
->
HelpStringDll
);
This
->
HelpStringDll
=
NULL
;
for
(
pCustData
=
This
->
pCustData
;
pCustData
;
pCustData
=
pCustDataNext
)
{
...
...
@@ -4679,23 +4667,14 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface)
if
(
This
->
no_free_data
)
goto
finish_free
;
if
(
This
->
Name
)
{
SysFreeString
(
This
->
Name
);
This
->
Name
=
0
;
}
SysFreeString
(
This
->
Name
);
This
->
Name
=
NULL
;
if
(
This
->
DocString
)
{
SysFreeString
(
This
->
DocString
);
This
->
DocString
=
0
;
}
SysFreeString
(
This
->
DocString
);
This
->
DocString
=
NULL
;
if
(
This
->
DllName
)
{
SysFreeString
(
This
->
DllName
);
This
->
DllName
=
0
;
}
SysFreeString
(
This
->
DllName
);
This
->
DllName
=
NULL
;
for
(
pFInfo
=
This
->
funclist
;
pFInfo
;
pFInfo
=
pFInfoNext
)
{
...
...
@@ -6526,7 +6505,7 @@ static HRESULT WINAPI ITypeInfo_fnAddressOfMember( ITypeInfo2 *iface,
{
ERR
(
"couldn't load %s
\n
"
,
debugstr_w
(
dll
));
SysFreeString
(
dll
);
if
(
entry
)
SysFreeString
(
entry
);
SysFreeString
(
entry
);
return
STG_E_FILENOTFOUND
;
}
/* FIXME: store library somewhere where we can free it */
...
...
@@ -6552,7 +6531,7 @@ static HRESULT WINAPI ITypeInfo_fnAddressOfMember( ITypeInfo2 *iface,
}
SysFreeString
(
dll
);
if
(
entry
)
SysFreeString
(
entry
);
SysFreeString
(
entry
);
if
(
!*
ppv
)
return
TYPE_E_DLLFUNCTIONNOTFOUND
;
...
...
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