Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
5e62686a
Commit
5e62686a
authored
Mar 22, 2009
by
James Hawkins
Committed by
Alexandre Julliard
Mar 23, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Handle a NULL and empty szPackagePath in MsiInstallProduct (Coverity 181).
parent
fb8db0ac
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
msi.c
dlls/msi/msi.c
+6
-0
install.c
dlls/msi/tests/install.c
+15
-0
No files found.
dlls/msi/msi.c
View file @
5e62686a
...
@@ -231,6 +231,12 @@ UINT WINAPI MsiInstallProductW(LPCWSTR szPackagePath, LPCWSTR szCommandLine)
...
@@ -231,6 +231,12 @@ UINT WINAPI MsiInstallProductW(LPCWSTR szPackagePath, LPCWSTR szCommandLine)
TRACE
(
"%s %s
\n
"
,
debugstr_w
(
szPackagePath
),
debugstr_w
(
szCommandLine
));
TRACE
(
"%s %s
\n
"
,
debugstr_w
(
szPackagePath
),
debugstr_w
(
szCommandLine
));
if
(
!
szPackagePath
)
return
ERROR_INVALID_PARAMETER
;
if
(
!*
szPackagePath
)
return
ERROR_PATH_NOT_FOUND
;
r
=
MSI_OpenPackageW
(
szPackagePath
,
&
package
);
r
=
MSI_OpenPackageW
(
szPackagePath
,
&
package
);
if
(
r
==
ERROR_SUCCESS
)
if
(
r
==
ERROR_SUCCESS
)
{
{
...
...
dlls/msi/tests/install.c
View file @
5e62686a
...
@@ -1721,6 +1721,21 @@ static void test_MsiInstallProduct(void)
...
@@ -1721,6 +1721,21 @@ static void test_MsiInstallProduct(void)
return
;
return
;
}
}
/* szPackagePath is NULL */
r
=
MsiInstallProductA
(
NULL
,
"INSTALL=ALL"
);
ok
(
r
==
ERROR_INVALID_PARAMETER
,
"Expected ERROR_INVALID_PARAMETER, got %d
\n
"
,
r
);
/* both szPackagePath and szCommandLine are NULL */
r
=
MsiInstallProductA
(
NULL
,
NULL
);
ok
(
r
==
ERROR_INVALID_PARAMETER
,
"Expected ERROR_INVALID_PARAMETER, got %d
\n
"
,
r
);
/* szPackagePath is empty */
r
=
MsiInstallProductA
(
""
,
"INSTALL=ALL"
);
ok
(
r
==
ERROR_PATH_NOT_FOUND
,
"Expected ERROR_PATH_NOT_FOUND, got %d
\n
"
,
r
);
create_test_files
();
create_test_files
();
create_database
(
msifile
,
tables
,
sizeof
(
tables
)
/
sizeof
(
msi_table
));
create_database
(
msifile
,
tables
,
sizeof
(
tables
)
/
sizeof
(
msi_table
));
...
...
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