aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAustin Hu <austin.hu@intel.com>2017-05-04 11:20:30 +0800
committerDaniel Cardenas <danielcar@google.com>2017-05-08 20:08:34 -0700
commitba6cd22cc9dbadb14dad331ef6ddc8b1e403a654 (patch)
tree48c380536179899be66fe245127e0bc1a97da7d5
parentac747113d4f6739b1462ca7fb40f2091691e209b (diff)
downloadandroid_hardware_intel_common_libwsbm-lineage-15.0.tar.gz
android_hardware_intel_common_libwsbm-lineage-15.0.tar.bz2
android_hardware_intel_common_libwsbm-lineage-15.0.zip
Fixed Klocwork erros.lineage-15.0
BZ: IMINAN-51481 Fixes: 38135184 Test: Netflix, play movies, youtube Change-Id: Ica82a8be2088e42d36add13bdead4fb7469619cf Signed-off-by: Austin Hu <austin.hu@intel.com> (cherry picked from commit 7440034b901f93a56dd35aca5745ce21f62d37b7)
-rw-r--r--src/wsbm_manager.c13
-rw-r--r--src/wsbm_slabpool.c4
2 files changed, 12 insertions, 5 deletions
diff --git a/src/wsbm_manager.c b/src/wsbm_manager.c
index 0cbf9de..877abc6 100644
--- a/src/wsbm_manager.c
+++ b/src/wsbm_manager.c
@@ -1015,15 +1015,18 @@ wsbmBOCreateList(int target, int hasKernelBuffers)
return NULL;
list->hasKernelBuffers = hasKernelBuffers;
if (hasKernelBuffers) {
- ret = validateCreateList(target, &list->kernelBuffers, 0);
- if (ret)
- return NULL;
+ ret = validateCreateList(target, &list->kernelBuffers, 0);
+ if (ret) {
+ free(list);
+ return NULL;
+ }
}
ret = validateCreateList(target, &list->userBuffers, 1);
if (ret) {
- validateFreeList(&list->kernelBuffers);
- return NULL;
+ validateFreeList(&list->kernelBuffers);
+ free(list);
+ return NULL;
}
return list;
diff --git a/src/wsbm_slabpool.c b/src/wsbm_slabpool.c
index ec6638b..1e551e3 100644
--- a/src/wsbm_slabpool.c
+++ b/src/wsbm_slabpool.c
@@ -463,6 +463,10 @@ wsbmAllocSlab(struct _WsbmSlabSizeHeader *header)
}
numBuffers = slab->kbo->actualSize / header->bufSize;
+ if (!numBuffers) {
+ ret = -ENOMEM;
+ goto out_err1;
+ }
slab->buffers = calloc(numBuffers, sizeof(*slab->buffers));
if (!slab->buffers) {