Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
0e5686a7
Commit
0e5686a7
authored
Sep 25, 2015
by
Feng Xiao
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #727 from AustinSchuh/arena_bounds_fix
Handled blocks being too small in arena.cc
parents
97a1c1e0
ad1d726c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
arena.cc
src/google/protobuf/arena.cc
+3
-0
No files found.
src/google/protobuf/arena.cc
View file @
0e5686a7
...
@@ -61,6 +61,9 @@ void Arena::Init() {
...
@@ -61,6 +61,9 @@ void Arena::Init() {
cleanup_list_
=
0
;
cleanup_list_
=
0
;
if
(
options_
.
initial_block
!=
NULL
&&
options_
.
initial_block_size
>
0
)
{
if
(
options_
.
initial_block
!=
NULL
&&
options_
.
initial_block_size
>
0
)
{
GOOGLE_CHECK_GE
(
options_
.
initial_block_size
,
sizeof
(
Block
))
<<
": Initial block size too small for header."
;
// Add first unowned block to list.
// Add first unowned block to list.
Block
*
first_block
=
reinterpret_cast
<
Block
*>
(
options_
.
initial_block
);
Block
*
first_block
=
reinterpret_cast
<
Block
*>
(
options_
.
initial_block
);
first_block
->
size
=
options_
.
initial_block_size
;
first_block
->
size
=
options_
.
initial_block_size
;
...
...
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