Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpim-sw
libcdi
Commits
0f21b23e
Commit
0f21b23e
authored
Sep 27, 2018
by
Uwe Schulzweida
Browse files
gridInqXValsPartSerial: check that length <= size.
parent
6da77d75
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/grid.c
View file @
0f21b23e
...
...
@@ -1558,7 +1558,7 @@ size_t gridInqXValsPartSerial(grid_t *gridptr, int start, size_t length, double
if
(
gridptr
->
x
.
vals
)
{
if
(
size
&&
xvals
)
if
(
size
&&
xvals
&&
length
<=
size
)
{
const
double
*
gridptr_xvals
=
gridptr
->
vtable
->
inqXValsPtr
(
gridptr
);
memcpy
(
xvals
,
gridptr_xvals
+
start
,
length
*
sizeof
(
double
));
...
...
@@ -1566,6 +1566,8 @@ size_t gridInqXValsPartSerial(grid_t *gridptr, int start, size_t length, double
}
else
size
=
0
;
return
size
;
}
static
...
...
@@ -1757,7 +1759,7 @@ size_t gridInqYValsPartSerial(grid_t *gridptr, int start, size_t length, double
if
(
gridptr
->
y
.
vals
)
{
if
(
size
&&
yvals
)
if
(
size
&&
yvals
&&
length
<=
size
)
{
const
double
*
gridptr_yvals
=
gridptr
->
vtable
->
inqYValsPtr
(
gridptr
);
memcpy
(
yvals
,
gridptr_yvals
+
start
,
length
*
sizeof
(
double
));
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment