Skip to content

Commit ba3bab5

Browse files
jesse99brson
authored andcommitted
---
yaml --- r: 36751 b: refs/heads/try2 c: 6bab226 h: refs/heads/master i: 36749: 6d44ee5 36747: b700e8b 36743: 03c7465 36735: 92d5526 v: v3
1 parent adcf576 commit ba3bab5

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: cf1c3d2da0cb6ebc4c34c122cde3a76523417ed4
8+
refs/heads/try2: 6bab226fc59f5bd011e243b5a4ec18adcbefdd58
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/rt/util/array_list.h

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include <inttypes.h>
1616
#include <stddef.h>
17+
#include <new>
1718

1819
/**
1920
* A simple, resizable array list. Note that this only works with POD types
@@ -69,8 +70,12 @@ array_list<T>::append(T value) {
6970
template<typename T> int32_t
7071
array_list<T>::push(T value) {
7172
if (_size == _capacity) {
72-
_capacity = _capacity * 2;
73-
_data = (T *) realloc(_data, _capacity * sizeof(T));
73+
size_t new_capacity = _capacity * 2;
74+
void* buffer = realloc(_data, new_capacity * sizeof(T));
75+
if (buffer == NULL)
76+
throw std::bad_alloc();
77+
_data = (T *) buffer;
78+
_capacity = new_capacity;
7479
}
7580
_data[_size ++] = value;
7681
return _size - 1;
@@ -115,11 +120,13 @@ array_list<T>::index_of(T value) const {
115120

116121
template<typename T> T &
117122
array_list<T>::operator[](size_t index) {
123+
assert(index < size());
118124
return _data[index];
119125
}
120126

121127
template<typename T> const T &
122128
array_list<T>::operator[](size_t index) const {
129+
assert(index < size());
123130
return _data[index];
124131
}
125132

0 commit comments

Comments
 (0)