Fix a potential crash

This commit is contained in:
Jan Vidar Krey 2010-04-21 18:34:39 +02:00
parent c82f8ba167
commit b6fb2b41bd

View File

@ -235,17 +235,18 @@ struct adc_message* adc_msg_copy(const struct adc_message* cmd)
copy->feature_cast_include = 0; copy->feature_cast_include = 0;
copy->feature_cast_exclude = 0; copy->feature_cast_exclude = 0;
if (cmd->cache) if (!adc_msg_grow(copy, copy->length))
{ {
if (!adc_msg_grow(copy, copy->length)) adc_msg_free(copy);
{ return NULL; /* OOM */
adc_msg_free(copy);
return NULL; /* OOM */
}
memcpy(copy->cache, cmd->cache, cmd->length);
copy->cache[copy->length] = 0;
} }
if (!copy->cache)
return NULL;
memcpy(copy->cache, cmd->cache, cmd->length);
copy->cache[copy->length] = 0;
if (cmd->feature_cast_include) if (cmd->feature_cast_include)
{ {
copy->feature_cast_include = list_create(); copy->feature_cast_include = list_create();