Skip to content

Commit 09ac3de

Browse files
mergify[bot]Tomoya Fujita
andauthored
Check SIZE_MAX for array initialization. (ros2#527) (ros2#530)
(cherry picked from commit 82fa2c9) Signed-off-by: Tomoya Fujita <Tomoya.Fujita@sony.com> Co-authored-by: Tomoya Fujita <Tomoya.Fujita@sony.com>
1 parent 4a50b75 commit 09ac3de

2 files changed

Lines changed: 19 additions & 0 deletions

File tree

‎src/uint8_array.c‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
#include <stdint.h>
16+
1517
#include "rcutils/error_handling.h"
1618
#include "rcutils/types/uint8_array.h"
1719

@@ -41,6 +43,12 @@ rcutils_uint8_array_init(
4143
uint8_array->allocator = *allocator;
4244

4345
if (buffer_capacity > 0lu) {
46+
if (buffer_capacity >= SIZE_MAX) {
47+
RCUTILS_SET_ERROR_MSG("requested capacity for uint8_array too large");
48+
uint8_array->buffer_capacity = 0lu;
49+
uint8_array->buffer_length = 0lu;
50+
return RCUTILS_RET_BAD_ALLOC;
51+
}
4452
uint8_array->buffer = (uint8_t *)allocator->allocate(
4553
buffer_capacity * sizeof(uint8_t), allocator->state);
4654
RCUTILS_CHECK_FOR_NULL_WITH_MSG(
@@ -87,6 +95,10 @@ rcutils_uint8_array_resize(rcutils_uint8_array_t * uint8_array, size_t new_size)
8795
// nothing to do here
8896
return RCUTILS_RET_OK;
8997
}
98+
if (new_size >= SIZE_MAX) {
99+
RCUTILS_SET_ERROR_MSG("requested size for uint8_array too large");
100+
return RCUTILS_RET_BAD_ALLOC;
101+
}
90102

91103
uint8_array->buffer = rcutils_reallocf(
92104
uint8_array->buffer, new_size * sizeof(uint8_t), allocator);

‎test/test_uint8_array.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ TEST(test_uint8_array, default_initialization) {
2222
auto uint8_array = rcutils_get_zero_initialized_uint8_array();
2323

2424
auto allocator = rcutils_get_default_allocator();
25+
EXPECT_EQ(RCUTILS_RET_BAD_ALLOC,
26+
rcutils_uint8_array_init(&uint8_array, SIZE_MAX, &allocator));
2527
EXPECT_EQ(RCUTILS_RET_OK, rcutils_uint8_array_init(&uint8_array, 0, &allocator));
2628
EXPECT_EQ(0lu, uint8_array.buffer_capacity);
2729
EXPECT_EQ(RCUTILS_RET_OK, rcutils_uint8_array_fini(&uint8_array));
@@ -44,6 +46,11 @@ TEST(test_uint8_array, resize) {
4446
EXPECT_EQ(0xFF, uint8_array.buffer[i]);
4547
}
4648

49+
ret = rcutils_uint8_array_resize(&uint8_array, SIZE_MAX);
50+
ASSERT_EQ(RCUTILS_RET_BAD_ALLOC, ret);
51+
EXPECT_EQ(5lu, uint8_array.buffer_capacity);
52+
EXPECT_EQ(5lu, uint8_array.buffer_length);
53+
4754
ret = rcutils_uint8_array_resize(&uint8_array, 0);
4855
ASSERT_EQ(RCUTILS_RET_INVALID_ARGUMENT, ret);
4956
EXPECT_EQ(5lu, uint8_array.buffer_capacity);

0 commit comments

Comments
 (0)