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
94d3d873
Commit
94d3d873
authored
May 13, 2014
by
Uwe Schulzweida
Browse files
grid.c: call memcpy only for size > 0
parent
1744c3e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/grid.c
View file @
94d3d873
...
...
@@ -1545,9 +1545,9 @@ int gridInqXvals(int gridID, double *xvals)
size
=
gridptr
->
xsize
;
if
(
CDI_Debug
&&
size
==
0
)
Warning
(
"
S
ize undefined for gridID = %d"
,
gridID
);
Warning
(
"
s
ize undefined for gridID = %d"
,
gridID
);
if
(
xvals
&&
gridptr
->
xvals
)
if
(
size
&&
xvals
&&
gridptr
->
xvals
)
memcpy
(
xvals
,
gridptr
->
xvals
,
size
*
sizeof
(
double
));
if
(
gridptr
->
xvals
==
NULL
)
size
=
0
;
...
...
@@ -1638,9 +1638,9 @@ int gridInqYvals(int gridID, double *yvals)
size
=
gridptr
->
ysize
;
if
(
CDI_Debug
&&
size
==
0
)
Warning
(
"
S
ize undefined for gridID = %d!"
,
gridID
);
Warning
(
"
s
ize undefined for gridID = %d!"
,
gridID
);
if
(
yvals
&&
gridptr
->
yvals
)
if
(
size
&&
yvals
&&
gridptr
->
yvals
)
memcpy
(
yvals
,
gridptr
->
yvals
,
size
*
sizeof
(
double
));
if
(
gridptr
->
yvals
==
NULL
)
size
=
0
;
...
...
@@ -3309,7 +3309,7 @@ int gridInqXbounds(int gridID, double *xbounds)
if
(
CDI_Debug
&&
size
==
0
)
Warning
(
"size undefined for gridID = %d"
,
gridID
);
if
(
xbounds
&&
gridptr
->
xbounds
)
if
(
size
&&
xbounds
&&
gridptr
->
xbounds
)
memcpy
(
xbounds
,
gridptr
->
xbounds
,
size
*
sizeof
(
double
));
if
(
gridptr
->
xbounds
==
NULL
)
size
=
0
;
...
...
@@ -3424,7 +3424,7 @@ int gridInqYbounds(int gridID, double *ybounds)
if
(
CDI_Debug
&&
size
==
0
)
Warning
(
"size undefined for gridID = %d"
,
gridID
);
if
(
ybounds
&&
gridptr
->
ybounds
)
if
(
size
&&
ybounds
&&
gridptr
->
ybounds
)
memcpy
(
ybounds
,
gridptr
->
ybounds
,
size
*
sizeof
(
double
));
if
(
gridptr
->
ybounds
==
NULL
)
size
=
0
;
...
...
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