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
fcbc5cc5
Commit
fcbc5cc5
authored
Nov 16, 2012
by
Frédéric Delanoy
Committed by
Alexandre Julliard
Nov 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Fix a couple of leaks (coverity).
parent
37419c4a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
files.c
dlls/msi/files.c
+4
-2
package.c
dlls/msi/package.c
+7
-0
No files found.
dlls/msi/files.c
View file @
fcbc5cc5
...
...
@@ -336,7 +336,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package)
if
(
rc
!=
ERROR_SUCCESS
)
{
ERR
(
"Unable to load media info for %s (%u)
\n
"
,
debugstr_w
(
file
->
File
),
rc
);
return
ERROR_FUNCTION_FAILED
;
rc
=
ERROR_FUNCTION_FAILED
;
goto
done
;
}
if
(
!
file
->
Component
->
Enabled
)
continue
;
...
...
@@ -513,7 +514,8 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package )
if
(
rc
!=
ERROR_SUCCESS
)
{
ERR
(
"Unable to load media info for %s (%u)
\n
"
,
debugstr_w
(
file
->
File
),
rc
);
return
ERROR_FUNCTION_FAILED
;
rc
=
ERROR_FUNCTION_FAILED
;
goto
done
;
}
comp
->
Action
=
msi_get_component_action
(
package
,
comp
);
if
(
!
comp
->
Enabled
||
comp
->
Action
!=
INSTALLSTATE_LOCAL
)
continue
;
...
...
dlls/msi/package.c
View file @
fcbc5cc5
...
...
@@ -1567,13 +1567,17 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage)
{
r
=
msi_create_empty_local_file
(
localfile
,
dotmsi
);
if
(
r
!=
ERROR_SUCCESS
)
{
msi_free
(
base_url
);
return
r
;
}
if
(
!
CopyFileW
(
file
,
localfile
,
FALSE
))
{
r
=
GetLastError
();
WARN
(
"unable to copy package %s to %s (%u)
\n
"
,
debugstr_w
(
file
),
debugstr_w
(
localfile
),
r
);
DeleteFileW
(
localfile
);
msi_free
(
base_url
);
return
r
;
}
delete_on_close
=
TRUE
;
...
...
@@ -1581,7 +1585,10 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage)
TRACE
(
"opening package %s
\n
"
,
debugstr_w
(
localfile
));
r
=
MSI_OpenDatabaseW
(
localfile
,
MSIDBOPEN_TRANSACT
,
&
db
);
if
(
r
!=
ERROR_SUCCESS
)
{
msi_free
(
base_url
);
return
r
;
}
}
package
=
MSI_CreatePackage
(
db
,
base_url
);
msi_free
(
base_url
);
...
...
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