diff options
| author | Haynes Mathew George <hgeorge@codeaurora.org> | 2014-09-26 16:26:21 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-10-20 13:54:37 -0700 |
| commit | 721128faa991d56d5765ead3d62aa9cf29967d1f (patch) | |
| tree | c9ddf8428e8fc0a170c83dd6d3cef8f6c764d509 | |
| parent | bced0f7a1e51efe6198df3d08dcd86b3abbcfacb (diff) | |
| download | frameworks_av-721128faa991d56d5765ead3d62aa9cf29967d1f.tar.gz frameworks_av-721128faa991d56d5765ead3d62aa9cf29967d1f.tar.bz2 frameworks_av-721128faa991d56d5765ead3d62aa9cf29967d1f.zip | |
effects: miscellaneous fixes
fixes of KW issues 8887, 8888
Change-Id: I824daa76d23456fed2c299c59f934d3e2ac78b84
| -rw-r--r-- | media/libeffects/factory/EffectsFactory.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/media/libeffects/factory/EffectsFactory.c b/media/libeffects/factory/EffectsFactory.c index 4b74208e79..bdf707d770 100644 --- a/media/libeffects/factory/EffectsFactory.c +++ b/media/libeffects/factory/EffectsFactory.c @@ -608,6 +608,11 @@ int addSubEffect(cnode *root) return -EINVAL; } d = malloc(sizeof(effect_descriptor_t)); + if (!d) { + ALOGE("failed to allocate effect descriptor"); + return -EINVAL; + } + if (l->desc->get_descriptor(&uuid, d) != 0) { char s[40]; uuidToString(&uuid, s, 40); @@ -692,8 +697,12 @@ int loadEffect(cnode *root) ALOGW("loadEffect() invalid uuid %s", node->value); return -EINVAL; } - d = malloc(sizeof(effect_descriptor_t)); + if (!d) { + ALOGE("failed to allocate effect descriptor"); + return -EINVAL; + } + if (l->desc->get_descriptor(&uuid, d) != 0) { char s[40]; uuidToString(&uuid, s, 40); |