summaryrefslogtreecommitdiff
path: root/pjlib/include/pj
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2012-11-22 05:00:01 +0000
committerNanang Izzuddin <nanang@teluu.com>2012-11-22 05:00:01 +0000
commitaa8a3b9e20ce37f09abfe1336b335a5f93d713c2 (patch)
treee47edabd8ea97aabfb994172c0cead2be296803d /pjlib/include/pj
parent59950a526565b533cd1bd7e7216843f3cb2cc483 (diff)
Fix #1593: avoid wrap around in caching pool capacity value.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4298 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/include/pj')
-rw-r--r--pjlib/include/pj/pool.h2
-rw-r--r--pjlib/include/pj/pool_i.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/pjlib/include/pj/pool.h b/pjlib/include/pj/pool.h
index 96c6de3b..3e9c76d5 100644
--- a/pjlib/include/pj/pool.h
+++ b/pjlib/include/pj/pool.h
@@ -509,7 +509,7 @@ PJ_INLINE(void*) pj_pool_zalloc(pj_pool_t *pool, pj_size_t size)
* Internal functions
*/
PJ_IDECL(void*) pj_pool_alloc_from_block(pj_pool_block *block, pj_size_t size);
-PJ_DECL(void*) pj_pool_allocate_find(pj_pool_t *pool, unsigned size);
+PJ_DECL(void*) pj_pool_allocate_find(pj_pool_t *pool, pj_size_t size);
diff --git a/pjlib/include/pj/pool_i.h b/pjlib/include/pj/pool_i.h
index 54621969..2f5d407c 100644
--- a/pjlib/include/pj/pool_i.h
+++ b/pjlib/include/pj/pool_i.h
@@ -47,7 +47,7 @@ PJ_IDEF(void*) pj_pool_alloc_from_block( pj_pool_block *block, pj_size_t size )
if (size & (PJ_POOL_ALIGNMENT-1)) {
size = (size + PJ_POOL_ALIGNMENT) & ~(PJ_POOL_ALIGNMENT-1);
}
- if ((unsigned)(block->end - block->cur) >= size) {
+ if ((pj_size_t)(block->end - block->cur) >= size) {
void *ptr = block->cur;
block->cur += size;
return ptr;