Fixed bug with indexer names being defined and generating seg fault if

creating a column not using indexers
This commit is contained in:
Celine Mercier
2016-04-27 14:01:36 +02:00
parent d159b921eb
commit f3b20b809d

View File

@ -587,7 +587,9 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
} }
// Build the indexer name if needed // Build the indexer name if needed
if (((data_type == OBI_STR) || (data_type == OBI_SEQ)) && (strcmp(indexer_name, "") == 0)) if ((data_type == OBI_STR) || (data_type == OBI_SEQ))
{
if (strcmp(indexer_name, "") == 0)
{ {
final_indexer_name = obi_build_indexer_name(column_name, version_number); final_indexer_name = obi_build_indexer_name(column_name, version_number);
if (final_indexer_name == NULL) if (final_indexer_name == NULL)
@ -598,6 +600,7 @@ OBIDMS_column_p obi_create_column(OBIDMS_p dms,
final_indexer_name = (char*) malloc((strlen(indexer_name)+1)*sizeof(char)); final_indexer_name = (char*) malloc((strlen(indexer_name)+1)*sizeof(char));
strcpy(final_indexer_name, indexer_name); strcpy(final_indexer_name, indexer_name);
} }
}
returned_data_type = data_type; returned_data_type = data_type;
if ((data_type == OBI_STR) || (data_type == OBI_SEQ)) if ((data_type == OBI_STR) || (data_type == OBI_SEQ))