Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Ark
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jan Paul Batrina
Ark
Commits
05a1b621
Commit
05a1b621
authored
Aug 18, 2020
by
Alexey Ivanov
🐢
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libzipplugin.cpp: unique_ptr without swap.
parent
2853d66c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
plugins/libzipplugin/libzipplugin.cpp
plugins/libzipplugin/libzipplugin.cpp
+3
-3
No files found.
plugins/libzipplugin/libzipplugin.cpp
View file @
05a1b621
...
...
@@ -676,9 +676,9 @@ bool LibzipPlugin::extractEntry(zip_t *archive, const QString &entry, const QStr
std
::
unique_ptr
<
zip_file
,
decltype
(
&
zip_fclose
)
>
zipFile
{
zip_fopen
(
archive
,
entry
.
toUtf8
().
constData
(),
0
),
&
zip_fclose
};
bool
firstTry
=
true
;
while
(
!
zipFile
.
get
())
{
std
::
unique_ptr
<
zip_file
,
decltype
(
&
zip_fclose
)
>
tempPtr
{
zip_fopen
(
archive
,
entry
.
toUtf8
().
constData
(),
0
),
&
zip_fclose
}
;
if
(
tempPtr
.
get
())
{
zipFile
.
swap
(
tempPtr
);
zipFile
.
reset
()
;
zipFile
=
{
zip_fopen
(
archive
,
entry
.
toUtf8
().
constData
(),
0
),
&
zip_fclose
};
if
(
zipFile
.
get
())
{
break
;
}
else
if
(
zip_error_code_zip
(
zip_get_error
(
archive
))
==
ZIP_ER_NOPASSWD
||
zip_error_code_zip
(
zip_get_error
(
archive
))
==
ZIP_ER_WRONGPASSWD
)
{
...
...
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