package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-04 16:52:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[osal]: add NULL pointer protection to mpp_allocator

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@807 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2016-05-24 08:09:49 +00:00
parent 91ef4a9dda
commit 251bfc81fa
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
osal/mpp_allocator.cpp
View File

@@ -34,10 +34,10 @@ MPP_RET mpp_allocator_alloc(MppAllocator allocator, MppBufferInfo *info)
return MPP_ERR_UNKNOW;
}
MPP_RET ret = MPP_OK;
MPP_RET ret = MPP_NOK;
MppAllocatorImpl *p = (MppAllocatorImpl *)allocator;
MPP_ALLOCATOR_LOCK(p);
if (p->os_api.alloc)
if (p->os_api.alloc && p->ctx)
ret = p->os_api.alloc(p->ctx, info);
MPP_ALLOCATOR_UNLOCK(p);
@@ -52,10 +52,10 @@ MPP_RET mpp_allocator_free(MppAllocator allocator, MppBufferInfo *info)
return MPP_ERR_UNKNOW;
}
MPP_RET ret = MPP_OK;
MPP_RET ret = MPP_NOK;
MppAllocatorImpl *p = (MppAllocatorImpl *)allocator;
MPP_ALLOCATOR_LOCK(p);
if (p->os_api.free)
if (p->os_api.free && p->ctx)
ret = p->os_api.free(p->ctx, info);
MPP_ALLOCATOR_UNLOCK(p);
@@ -69,13 +69,13 @@ MPP_RET mpp_allocator_import(MppAllocator allocator, MppBufferInfo *info)
return MPP_ERR_UNKNOW;
}
MPP_RET ret = MPP_OK;
MPP_RET ret = MPP_NOK;
MppAllocatorImpl *p = (MppAllocatorImpl *)allocator;
if (p->os_api.import) {
MPP_ALLOCATOR_LOCK(p);
MPP_ALLOCATOR_LOCK(p);
if (p->os_api.import && p->ctx) {
ret = p->os_api.import(p->ctx, info);
MPP_ALLOCATOR_UNLOCK(p);
}
MPP_ALLOCATOR_UNLOCK(p);
return ret;
}
@@ -89,13 +89,13 @@ MPP_RET mpp_allocator_release(MppAllocator allocator, MppBufferInfo *info)
return MPP_ERR_UNKNOW;
}
MPP_RET ret = MPP_OK;
MPP_RET ret = MPP_NOK;
MppAllocatorImpl *p = (MppAllocatorImpl *)allocator;
if (p->os_api.release) {
MPP_ALLOCATOR_LOCK(p);
MPP_ALLOCATOR_LOCK(p);
if (p->os_api.release && p->ctx) {
ret = p->os_api.release(p->ctx, info);
MPP_ALLOCATOR_UNLOCK(p);
}
MPP_ALLOCATOR_UNLOCK(p);
return ret;
}
@@ -158,7 +158,7 @@ MPP_RET mpp_alloctor_put(MppAllocator *allocator)
MppAllocatorImpl *p = (MppAllocatorImpl *)*allocator;
*allocator = NULL;
if (p->os_api.close)
if (p->os_api.close && p->ctx)
p->os_api.close(p->ctx);
pthread_mutex_destroy(&p->lock);
mpp_free(p);