Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
relibc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
relibc
Commits
7c81de68
Commit
7c81de68
authored
8 months ago
by
Derick Eddington
Browse files
Options
Downloads
Patches
Plain Diff
Fix `header::grp::parse_grp`.
parent
802748b6
No related branches found
No related tags found
1 merge request
!481
Four distinct fixes for significant incorrectness bugs, as three small commits
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/header/grp/mod.rs
+17
-6
17 additions, 6 deletions
src/header/grp/mod.rs
with
17 additions
and
6 deletions
src/header/grp/mod.rs
+
17
−
6
View file @
7c81de68
...
...
@@ -187,8 +187,8 @@ fn parse_grp(line: String, destbuf: Option<DestBuffer>) -> Result<OwnedGrp, Erro
let
members
=
buffer
.next
()
.ok_or
(
Error
::
EOF
)
?
;
// Get the
pointer to
the members array
let
member_array_
ptr
=
unsafe
{
vec
.as_mut_ptr
()
.add
(
vec
.len
())
as
*
mut
usize
}
;
// Get the
offset of
the members array
let
member_array_
start
=
vec
.len
()
;
// Push enough null pointers to fit all members
for
_member
in
members
...
...
@@ -197,6 +197,7 @@ fn parse_grp(line: String, destbuf: Option<DestBuffer>) -> Result<OwnedGrp, Erro
{
vec
.extend
(
0usize
.to_ne_bytes
());
}
let
member_array_end
=
vec
.len
();
// Push a null pointer to terminate the members array
vec
.extend
(
0usize
.to_ne_bytes
());
...
...
@@ -206,10 +207,20 @@ fn parse_grp(line: String, destbuf: Option<DestBuffer>) -> Result<OwnedGrp, Erro
.filter
(|
member
|
!
member
.is_empty
())
.enumerate
()
{
let
cur_offset
=
vec
.len
();
// This must be recomputed each time, because `vec` is undergoing extensions and so
// its backing memory might be reallocated and moved and its old memory deallocated.
let
member_array
=
&
mut
vec
[
member_array_start
..
member_array_end
];
let
member_ptr
=
{
const
SIZEOF_PTR
:
usize
=
mem
::
size_of
::
<*
mut
c_void
>
();
let
start
=
i
*
SIZEOF_PTR
;
let
end
=
start
+
SIZEOF_PTR
;
&
mut
member_array
[
start
..
end
]
};
// Store offset to start of member, MUST BE ADJUSTED LATER BASED ON THE ADDRESS OF THE BUFFER
unsafe
{
*
member_array_ptr
.add
(
i
)
=
vec
.len
();
}
member_ptr
.copy_from_slice
(
&
cur_offset
.to_ne_bytes
());
vec
.extend
(
member
);
vec
.push
(
0
);
...
...
@@ -223,7 +234,7 @@ fn parse_grp(line: String, destbuf: Option<DestBuffer>) -> Result<OwnedGrp, Erro
Some
(
buf
)
=>
{
let
mut
buf
=
MaybeAllocated
::
Borrowed
(
buf
);
if
buf
.len
()
<
buf
.len
()
{
if
buf
.len
()
<
strings
.len
()
{
platform
::
ERRNO
.set
(
errno
::
ERANGE
);
return
Err
(
Error
::
BufTooSmall
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment