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
cdo
Commits
24fbb09c
Commit
24fbb09c
authored
Nov 01, 2017
by
Uwe Schulzweida
Browse files
pmergesort: allocated tmp only if max_threads > 1 (bug fix).
parent
e81961ff
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/kdtreelib/pmergesort.cc
View file @
24fbb09c
...
...
@@ -25,13 +25,15 @@ void *mergesort_t(void *args);
int
pmergesort
(
struct
kd_point
*
base
,
size_t
nmemb
,
int
axis
,
int
max_threads
)
{
struct
kd_point
*
tmp
;
param_t
args
;
struct
kd_point
*
tmp
=
NULL
;
if
((
tmp
=
(
struct
kd_point
*
)
calloc
(
nmemb
,
sizeof
(
struct
kd_point
)))
==
NULL
)
{
if
(
max_threads
>
1
)
if
((
tmp
=
(
struct
kd_point
*
)
calloc
(
nmemb
,
sizeof
(
struct
kd_point
)))
==
NULL
)
{
perror
(
"malloc"
);
return
0
;
}
}
param_t
args
;
args
.
a
=
base
;
args
.
b
=
tmp
;
args
.
first
=
0
;
...
...
@@ -41,7 +43,8 @@ int pmergesort(struct kd_point *base, size_t nmemb, int axis, int max_threads)
mergesort_t
(
&
args
);
free
(
tmp
);
if
(
tmp
)
free
(
tmp
);
return
1
;
}
...
...
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