Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
ddd51bd1
Unverified
Commit
ddd51bd1
authored
May 19, 2021
by
Stéphane Graber
Committed by
GitHub
May 19, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3846 from brauner/2021-05-19.fixes
conf: fix mount option parsing
parents
e2e70bd5
380fcc08
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
3 deletions
+1
-3
conf.c
src/lxc/conf.c
+1
-3
No files found.
src/lxc/conf.c
View file @
ddd51bd1
...
@@ -2110,7 +2110,7 @@ static int parse_vfs_attr(struct lxc_mount_options *opts, char *opt, size_t size
...
@@ -2110,7 +2110,7 @@ static int parse_vfs_attr(struct lxc_mount_options *opts, char *opt, size_t size
static
int
parse_mount_attrs
(
struct
lxc_mount_options
*
opts
,
const
char
*
mntopts
)
static
int
parse_mount_attrs
(
struct
lxc_mount_options
*
opts
,
const
char
*
mntopts
)
{
{
__do_free
char
*
mntopts_new
=
NULL
,
*
mntopts_dup
=
NULL
;
__do_free
char
*
mntopts_new
=
NULL
,
*
mntopts_dup
=
NULL
;
char
*
mntopt_cur
=
NULL
;
char
*
end
=
NULL
,
*
mntopt_cur
=
NULL
;
int
ret
;
int
ret
;
size_t
size
;
size_t
size
;
...
@@ -2130,8 +2130,6 @@ static int parse_mount_attrs(struct lxc_mount_options *opts, const char *mntopts
...
@@ -2130,8 +2130,6 @@ static int parse_mount_attrs(struct lxc_mount_options *opts, const char *mntopts
return
ret_errno
(
ENOMEM
);
return
ret_errno
(
ENOMEM
);
lxc_iterate_parts
(
mntopt_cur
,
mntopts_dup
,
","
)
{
lxc_iterate_parts
(
mntopt_cur
,
mntopts_dup
,
","
)
{
char
*
end
=
NULL
;
/* This is a filesystem specific option. */
/* This is a filesystem specific option. */
if
(
strchr
(
mntopt_cur
,
'='
))
{
if
(
strchr
(
mntopt_cur
,
'='
))
{
if
(
!
end
)
{
if
(
!
end
)
{
...
...
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