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
c6dcff0a
Commit
c6dcff0a
authored
Jan 25, 2022
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor dynamic_bitset changes
parent
b791dc5e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
misc.hpp
native/jni/utils/misc.hpp
+8
-1
hook.cpp
native/jni/zygisk/hook.cpp
+1
-4
No files found.
native/jni/utils/misc.hpp
View file @
c6dcff0a
...
...
@@ -94,8 +94,15 @@ public:
}
return
slot_list
[
slot
][
index
];
}
bool
operator
[]
(
size_t
pos
)
const
{
size_t
slot
=
pos
/
slot_size
;
size_t
index
=
pos
%
slot_size
;
return
slot_list
.
size
()
>
slot
&&
slot_list
[
slot
][
index
];
}
size_t
slots
()
const
{
return
slot_list
.
size
();
}
slot_type
get_slot
(
size_t
slot
)
const
{
return
slot_list
[
slot
].
to_ulong
();
}
slot_type
get_slot
(
size_t
slot
)
const
{
return
slot_list
.
size
()
>
slot
?
slot_list
[
slot
].
to_ulong
()
:
0ul
;
}
private
:
std
::
vector
<
slot_bits
>
slot_list
;
};
...
...
native/jni/zygisk/hook.cpp
View file @
c6dcff0a
...
...
@@ -498,11 +498,8 @@ void HookContext::nativeForkSystemServer_pre() {
// Send the bitset of module status back to magiskd from system_server
dynamic_bitset
bits
;
// Pre-allocate enough bits
bits
[
module_fds
.
size
()
-
1
]
=
false
;
for
(
const
auto
&
m
:
modules
)
{
for
(
const
auto
&
m
:
modules
)
bits
[
m
.
getId
()]
=
true
;
}
write_int
(
fd
,
bits
.
slots
());
for
(
int
i
=
0
;
i
<
bits
.
slots
();
++
i
)
{
auto
l
=
bits
.
get_slot
(
i
);
...
...
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