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
af99c1b8
Commit
af99c1b8
authored
Sep 15, 2022
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't crash when nullptr paired with len = 0
parent
c6646efe
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
10 deletions
+30
-10
files.rs
native/src/base/files.rs
+3
-2
misc.rs
native/src/base/misc.rs
+21
-1
xwrap.rs
native/src/base/xwrap.rs
+6
-7
No files found.
native/src/base/files.rs
View file @
af99c1b8
...
@@ -7,10 +7,11 @@ use crate::{bfmt_cstr, errno, xopen};
...
@@ -7,10 +7,11 @@ use crate::{bfmt_cstr, errno, xopen};
mod
unsafe_impl
{
mod
unsafe_impl
{
use
std
::
ffi
::
CStr
;
use
std
::
ffi
::
CStr
;
use
std
::
slice
;
use
libc
::
c_char
;
use
libc
::
c_char
;
use
crate
::
slice_from_ptr_mut
;
#[no_mangle]
#[no_mangle]
pub
unsafe
extern
"C"
fn
read_link
(
path
:
*
const
c_char
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
pub
unsafe
extern
"C"
fn
read_link
(
path
:
*
const
c_char
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
let
r
=
libc
::
readlink
(
path
,
buf
.cast
(),
bufsz
-
1
);
let
r
=
libc
::
readlink
(
path
,
buf
.cast
(),
bufsz
-
1
);
...
@@ -22,7 +23,7 @@ mod unsafe_impl {
...
@@ -22,7 +23,7 @@ mod unsafe_impl {
#[no_mangle]
#[no_mangle]
unsafe
extern
"C"
fn
canonical_path
(
path
:
*
const
c_char
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
unsafe
extern
"C"
fn
canonical_path
(
path
:
*
const
c_char
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
super
::
canonical_path
(
CStr
::
from_ptr
(
path
),
slice
::
from_raw_parts
_mut
(
buf
,
bufsz
))
super
::
canonical_path
(
CStr
::
from_ptr
(
path
),
slice
_from_ptr
_mut
(
buf
,
bufsz
))
}
}
}
}
...
...
native/src/base/misc.rs
View file @
af99c1b8
use
std
::
cmp
::
min
;
use
std
::
cmp
::
min
;
use
std
::
ffi
::
CStr
;
use
std
::
ffi
::
CStr
;
use
std
::
fmt
;
use
std
::
fmt
::
Arguments
;
use
std
::
fmt
::
Arguments
;
use
std
::{
fmt
,
slice
};
struct
BufFmtWriter
<
'a
>
{
struct
BufFmtWriter
<
'a
>
{
buf
:
&
'a
mut
[
u8
],
buf
:
&
'a
mut
[
u8
],
...
@@ -118,3 +118,23 @@ pub fn errno() -> &'static mut i32 {
...
@@ -118,3 +118,23 @@ pub fn errno() -> &'static mut i32 {
pub
fn
error_str
()
->
&
'static
str
{
pub
fn
error_str
()
->
&
'static
str
{
unsafe
{
ptr_to_str
(
libc
::
strerror
(
*
errno
()))
}
unsafe
{
ptr_to_str
(
libc
::
strerror
(
*
errno
()))
}
}
}
// When len is 0, don't care whether buf is null or not
#[inline]
pub
unsafe
fn
slice_from_ptr
<
'a
,
T
>
(
buf
:
*
const
T
,
len
:
usize
)
->
&
'a
[
T
]
{
if
len
==
0
{
&
[]
}
else
{
slice
::
from_raw_parts
(
buf
,
len
)
}
}
// When len is 0, don't care whether buf is null or not
#[inline]
pub
unsafe
fn
slice_from_ptr_mut
<
'a
,
T
>
(
buf
:
*
mut
T
,
len
:
usize
)
->
&
'a
mut
[
T
]
{
if
len
==
0
{
&
mut
[]
}
else
{
slice
::
from_raw_parts_mut
(
buf
,
len
)
}
}
native/src/base/xwrap.rs
View file @
af99c1b8
...
@@ -12,36 +12,35 @@ use crate::{canonical_path, cstr, errno, error, mkdirs, perror, ptr_to_str, read
...
@@ -12,36 +12,35 @@ use crate::{canonical_path, cstr, errno, error, mkdirs, perror, ptr_to_str, read
mod
unsafe_impl
{
mod
unsafe_impl
{
use
std
::
ffi
::
CStr
;
use
std
::
ffi
::
CStr
;
use
std
::
os
::
unix
::
io
::
RawFd
;
use
std
::
os
::
unix
::
io
::
RawFd
;
use
std
::
slice
;
use
cfg_if
::
cfg_if
;
use
cfg_if
::
cfg_if
;
use
libc
::{
c_char
,
nfds_t
,
off_t
,
pollfd
};
use
libc
::{
c_char
,
nfds_t
,
off_t
,
pollfd
};
use
crate
::{
perror
,
ptr_to_str
};
use
crate
::{
perror
,
ptr_to_str
,
slice_from_ptr
,
slice_from_ptr_mut
};
#[no_mangle]
#[no_mangle]
unsafe
extern
"C"
fn
xwrite
(
fd
:
RawFd
,
buf
:
*
const
u8
,
bufsz
:
usize
)
->
isize
{
unsafe
extern
"C"
fn
xwrite
(
fd
:
RawFd
,
buf
:
*
const
u8
,
bufsz
:
usize
)
->
isize
{
super
::
xwrite
(
fd
,
slice
::
from_raw_parts
(
buf
,
bufsz
))
super
::
xwrite
(
fd
,
slice
_from_ptr
(
buf
,
bufsz
))
}
}
#[no_mangle]
#[no_mangle]
unsafe
extern
"C"
fn
xread
(
fd
:
RawFd
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
unsafe
extern
"C"
fn
xread
(
fd
:
RawFd
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
super
::
xread
(
fd
,
slice
::
from_raw_parts
_mut
(
buf
,
bufsz
))
super
::
xread
(
fd
,
slice
_from_ptr
_mut
(
buf
,
bufsz
))
}
}
#[no_mangle]
#[no_mangle]
unsafe
extern
"C"
fn
xxread
(
fd
:
RawFd
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
unsafe
extern
"C"
fn
xxread
(
fd
:
RawFd
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
super
::
xxread
(
fd
,
slice
::
from_raw_parts
_mut
(
buf
,
bufsz
))
super
::
xxread
(
fd
,
slice
_from_ptr
_mut
(
buf
,
bufsz
))
}
}
#[no_mangle]
#[no_mangle]
unsafe
extern
"C"
fn
xcanonical_path
(
path
:
*
const
c_char
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
unsafe
extern
"C"
fn
xcanonical_path
(
path
:
*
const
c_char
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
super
::
xcanonical_path
(
CStr
::
from_ptr
(
path
),
slice
::
from_raw_parts
_mut
(
buf
,
bufsz
))
super
::
xcanonical_path
(
CStr
::
from_ptr
(
path
),
slice
_from_ptr
_mut
(
buf
,
bufsz
))
}
}
#[no_mangle]
#[no_mangle]
unsafe
extern
"C"
fn
xreadlink
(
path
:
*
const
c_char
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
unsafe
extern
"C"
fn
xreadlink
(
path
:
*
const
c_char
,
buf
:
*
mut
u8
,
bufsz
:
usize
)
->
isize
{
super
::
xreadlink
(
CStr
::
from_ptr
(
path
),
slice
::
from_raw_parts
_mut
(
buf
,
bufsz
))
super
::
xreadlink
(
CStr
::
from_ptr
(
path
),
slice
_from_ptr
_mut
(
buf
,
bufsz
))
}
}
#[no_mangle]
#[no_mangle]
...
...
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