Skip to content

Commit 29915fc

Browse files
authored
Merge pull request #6292 from ggouaillardet/topic/opal_datatype_destruct
opal/datatype: plug a memory leak in opal_datatype_t destructor
2 parents ea40d48 + 7c938f0 commit 29915fc

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

opal/datatype/opal_datatype_create.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
* Copyright (c) 2004-2006 The Regents of the University of California.
1212
* All rights reserved.
1313
* Copyright (c) 2009 Oak Ridge National Labs. All rights reserved.
14+
* Copyright (c) 2019 Research Organization for Information Science
15+
* and Technology (RIST). All rights reserved.
1416
* $COPYRIGHT$
1517
*
1618
* Additional copyrights may follow
@@ -77,7 +79,7 @@ static void opal_datatype_destruct( opal_datatype_t* datatype )
7779
}
7880
}
7981
/* dont free the ptypes of predefined types (it was not dynamically allocated) */
80-
if( (NULL != datatype->ptypes) && (datatype->id >= OPAL_DATATYPE_MAX_PREDEFINED) ) {
82+
if( (NULL != datatype->ptypes) && (!opal_datatype_is_predefined(datatype)) ) {
8183
free(datatype->ptypes);
8284
datatype->ptypes = NULL;
8385
}

0 commit comments

Comments
 (0)