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
d2cb638f
Commit
d2cb638f
authored
Mar 08, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use our own function to parse int
parent
bbe4b69c
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
22 deletions
+29
-22
daemon.cpp
native/jni/core/daemon.cpp
+1
-1
db.cpp
native/jni/core/db.cpp
+6
-5
magiskhide.h
native/jni/magiskhide/magiskhide.h
+0
-15
su.cpp
native/jni/su/su.cpp
+1
-1
utils.h
native/jni/utils/include/utils.h
+6
-0
misc.cpp
native/jni/utils/misc.cpp
+15
-0
No files found.
native/jni/core/daemon.cpp
View file @
d2cb638f
...
...
@@ -120,7 +120,7 @@ static void main_daemon() {
parse_prop_file
(
"/system/build.prop"
,
[](
auto
key
,
auto
val
)
->
bool
{
if
(
key
==
"ro.build.version.sdk"
)
{
LOGI
(
"* Device API level: %s
\n
"
,
val
.
data
());
SDK_INT
=
atoi
(
val
.
data
()
);
SDK_INT
=
parse_int
(
val
);
return
false
;
}
return
true
;
...
...
native/jni/core/db.cpp
View file @
d2cb638f
...
...
@@ -8,6 +8,7 @@
#include <magisk.h>
#include <db.h>
#include <daemon.h>
#include <utils.h>
#define DB_VERSION 9
...
...
@@ -42,7 +43,7 @@ int db_settings::getKeyIdx(string_view key) const {
}
static
int
ver_cb
(
void
*
ver
,
int
,
char
**
data
,
char
**
)
{
*
((
int
*
)
ver
)
=
atoi
(
data
[
0
]);
*
((
int
*
)
ver
)
=
parse_int
(
data
[
0
]);
return
0
;
}
...
...
@@ -199,7 +200,7 @@ char *db_exec(const char *sql, const db_row_cb &fn) {
int
get_db_settings
(
db_settings
&
cfg
,
int
key
)
{
char
*
err
;
auto
settings_cb
=
[
&
](
db_row
&
row
)
->
bool
{
cfg
[
row
[
"key"
]]
=
atoi
(
row
[
"value"
].
data
()
);
cfg
[
row
[
"key"
]]
=
parse_int
(
row
[
"value"
]
);
LOGD
(
"magiskdb: query %s=[%s]
\n
"
,
row
[
"key"
].
data
(),
row
[
"value"
].
data
());
return
true
;
};
...
...
@@ -237,9 +238,9 @@ int get_uid_policy(int uid, su_access &su) {
sprintf
(
query
,
"SELECT policy, logging, notification FROM policies "
"WHERE uid=%d AND (until=0 OR until>%li)"
,
uid
,
time
(
nullptr
));
err
=
db_exec
(
query
,
[
&
](
db_row
&
row
)
->
bool
{
su
.
policy
=
(
policy_t
)
atoi
(
row
[
"policy"
].
data
()
);
su
.
log
=
atoi
(
row
[
"logging"
].
data
()
);
su
.
notify
=
atoi
(
row
[
"notification"
].
data
()
);
su
.
policy
=
(
policy_t
)
parse_int
(
row
[
"policy"
]
);
su
.
log
=
parse_int
(
row
[
"logging"
]
);
su
.
notify
=
parse_int
(
row
[
"notification"
]
);
LOGD
(
"magiskdb: query policy=[%d] log=[%d] notify=[%d]
\n
"
,
su
.
policy
,
su
.
log
,
su
.
notify
);
return
true
;
});
...
...
native/jni/magiskhide/magiskhide.h
View file @
d2cb638f
...
...
@@ -38,21 +38,6 @@ void clean_magisk_props();
void
crawl_procfs
(
const
std
::
function
<
bool
(
int
)
>
&
fn
);
bool
proc_name_match
(
int
pid
,
const
char
*
name
);
/*
* Bionic's atoi runs through strtol().
* Use our own implementation for faster conversion.
*/
static
inline
int
parse_int
(
const
char
*
s
)
{
int
val
=
0
;
char
c
;
while
((
c
=
*
(
s
++
)))
{
if
(
c
>
'9'
||
c
<
'0'
)
return
-
1
;
val
=
val
*
10
+
c
-
'0'
;
}
return
val
;
}
extern
pthread_t
proc_monitor_thread
;
extern
bool
hide_enabled
;
extern
pthread_mutex_t
monitor_lock
;
...
...
native/jni/su/su.cpp
View file @
d2cb638f
...
...
@@ -177,7 +177,7 @@ int su_client_main(int argc, char *argv[]) {
if
(
pw
)
su_req
.
uid
=
pw
->
pw_uid
;
else
su_req
.
uid
=
atoi
(
argv
[
optind
]);
su_req
.
uid
=
parse_int
(
argv
[
optind
]);
optind
++
;
}
...
...
native/jni/utils/include/utils.h
View file @
d2cb638f
...
...
@@ -83,6 +83,7 @@ int strend(const char *s1, const char *s2);
char
*
rtrim
(
char
*
str
);
void
init_argv0
(
int
argc
,
char
**
argv
);
void
set_nice_name
(
const
char
*
name
);
int
parse_int
(
const
char
*
s
);
#define getline __getline
#define getdelim __getdelim
...
...
@@ -203,6 +204,11 @@ void mmap_rw(const char *filename, B &buf, L &sz) {
// misc.cpp
template
<
class
S
>
int
parse_int
(
S
__s
)
{
return
parse_int
(
__s
.
data
());
}
int
new_daemon_thread
(
void
*
(
*
start_routine
)
(
void
*
),
void
*
arg
=
nullptr
,
const
pthread_attr_t
*
attr
=
nullptr
);
...
...
native/jni/utils/misc.cpp
View file @
d2cb638f
...
...
@@ -230,3 +230,18 @@ char *rtrim(char *str) {
str
[
len
]
=
'\0'
;
return
str
;
}
/*
* Bionic's atoi runs through strtol().
* Use our own implementation for faster conversion.
*/
int
parse_int
(
const
char
*
s
)
{
int
val
=
0
;
char
c
;
while
((
c
=
*
(
s
++
)))
{
if
(
c
>
'9'
||
c
<
'0'
)
return
-
1
;
val
=
val
*
10
+
c
-
'0'
;
}
return
val
;
}
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