Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
49abfcaf
Commit
49abfcaf
authored
Oct 25, 2021
by
LoveSy
Committed by
topjohnwu
Oct 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix nullptr dereference when env abnormal
parent
50710c72
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
24 deletions
+25
-24
module.cpp
native/jni/core/module.cpp
+25
-24
No files found.
native/jni/core/module.cpp
View file @
49abfcaf
...
...
@@ -574,34 +574,35 @@ void magic_mount() {
char
buf
[
4096
];
LOGI
(
"* Loading modules
\n
"
);
for
(
const
auto
&
m
:
*
modules
)
{
const
char
*
module
=
m
.
name
.
data
();
char
*
b
=
buf
+
sprintf
(
buf
,
"%s/"
MODULEMNT
"/%s/"
,
MAGISKTMP
.
data
(),
module
);
// Read props
strcpy
(
b
,
"system.prop"
);
if
(
access
(
buf
,
F_OK
)
==
0
)
{
LOGI
(
"%s: loading [system.prop]
\n
"
,
module
);
load_prop_file
(
buf
,
false
);
}
if
(
modules
)
{
for
(
const
auto
&
m
:
*
modules
)
{
const
char
*
module
=
m
.
name
.
data
();
char
*
b
=
buf
+
sprintf
(
buf
,
"%s/"
MODULEMNT
"/%s/"
,
MAGISKTMP
.
data
(),
module
);
// Read props
strcpy
(
b
,
"system.prop"
);
if
(
access
(
buf
,
F_OK
)
==
0
)
{
LOGI
(
"%s: loading [system.prop]
\n
"
,
module
);
load_prop_file
(
buf
,
false
);
}
// Check whether skip mounting
strcpy
(
b
,
"skip_mount"
);
if
(
access
(
buf
,
F_OK
)
==
0
)
continue
;
// Check whether skip mounting
strcpy
(
b
,
"skip_mount"
);
if
(
access
(
buf
,
F_OK
)
==
0
)
continue
;
// Double check whether the system folder exists
strcpy
(
b
,
"system"
);
if
(
access
(
buf
,
F_OK
)
!=
0
)
continue
;
// Double check whether the system folder exists
strcpy
(
b
,
"system"
);
if
(
access
(
buf
,
F_OK
)
!=
0
)
continue
;
LOGI
(
"%s: loading mount files
\n
"
,
module
);
b
[
-
1
]
=
'\0'
;
int
fd
=
xopen
(
buf
,
O_RDONLY
|
O_CLOEXEC
);
system
->
collect_files
(
module
,
fd
);
close
(
fd
);
LOGI
(
"%s: loading mount files
\n
"
,
module
);
b
[
-
1
]
=
'\0'
;
int
fd
=
xopen
(
buf
,
O_RDONLY
|
O_CLOEXEC
);
system
->
collect_files
(
module
,
fd
);
close
(
fd
);
}
}
if
(
MAGISKTMP
!=
"/sbin"
)
{
// Need to inject our binaries into /system/bin
inject_magisk_bins
(
system
);
...
...
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