From: Mengdong Lin mengdong.lin@linux.intel.com
tplg_copy_data() should set the valid referenced data element pointer on success. The caller will double check this pointer for all kinds of references, including controls and data.
Signed-off-by: Mengdong Lin mengdong.lin@linux.intel.com
diff --git a/src/topology/data.c b/src/topology/data.c index 768fc27..4798086 100644 --- a/src/topology/data.c +++ b/src/topology/data.c @@ -1053,8 +1053,10 @@ int tplg_copy_data(snd_tplg_t *tplg, struct tplg_elem *elem,
tplg_dbg("Data '%s' used by '%s'\n", ref->id, elem->id); /* overlook empty private data */ - if (!ref_elem->data || !ref_elem->data->size) + if (!ref_elem->data || !ref_elem->data->size) { + ref->elem = ref_elem; return 0; + }
old_priv = get_priv_data(elem); if (!old_priv) @@ -1078,6 +1080,8 @@ int tplg_copy_data(snd_tplg_t *tplg, struct tplg_elem *elem, ref_elem->compound_elem = 1; memcpy(priv->data + old_priv_data_size, ref_elem->data->data, priv_data_size); + + ref->elem = ref_elem; return 0; }