Merge pull request #1056 from yockie/master

fix heap overflow in simple_data_pool
apache · Mar 8, 2020 · 6fb40c3 · 6fb40c3
2 parents 23c66e3 + d2c580e
commit 6fb40c3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/brpc/simple_data_pool.h b/src/brpc/simple_data_pool.h
@@ -144,7 +144,7 @@ inline void SimpleDataPool::Return(void* data) {
     }
     std::unique_lock<butil::Mutex> mu(_mutex);
     if (_capacity == _size) {
-        const unsigned new_cap = (_capacity == 0 ? 128 : (_capacity * 3 / 2));
+        const unsigned new_cap = (_capacity <= 1 ? 128 : (_capacity * 3 / 2));
         void** new_pool = (void**)malloc(new_cap * sizeof(void*));
         if (NULL == new_pool) {
             mu.unlock();