diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-17 14:27:11 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-17 14:27:11 +0000 |
commit | 48a7d49ceaecce1256f02718e8fba2cfc8288674 (patch) | |
tree | 48c380536179899be66fe245127e0bc1a97da7d5 | |
parent | ac747113d4f6739b1462ca7fb40f2091691e209b (diff) | |
parent | a5760c68f2880c7451d4fc84b629c9142fe65dae (diff) | |
download | libwsbm-oreo-m8-release.tar.gz |
release-request-323db86e-b638-4d24-8eb1-d2e3bf4a9d1a-for-git_oc-mr1-release-4017779 snap-temp-L47900000064949209android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-release
Change-Id: I9eb297114f31f47eb4206ebc273dec15d7ac0221
-rw-r--r-- | src/wsbm_manager.c | 13 | ||||
-rw-r--r-- | src/wsbm_slabpool.c | 4 |
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) { |