aboutsummaryrefslogtreecommitdiffstats
path: root/src/libmdsserver/linked-list.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-04-26 20:35:17 +0200
committerMattias Andrée <maandree@operamail.com>2014-04-26 20:35:17 +0200
commit46a7bdce1581ac23105c61567b47affe4867e92d (patch)
tree63185a7ae44c6cb29010baace9e8f61f1281c97a /src/libmdsserver/linked-list.c
parentadd table optimised for file descriptors (diff)
downloadmds-46a7bdce1581ac23105c61567b47affe4867e92d.tar.gz
mds-46a7bdce1581ac23105c61567b47affe4867e92d.tar.bz2
mds-46a7bdce1581ac23105c61567b47affe4867e92d.tar.xz
take care of realloc failures
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src/libmdsserver/linked-list.c')
-rw-r--r--src/libmdsserver/linked-list.c31
1 files changed, 23 insertions, 8 deletions
diff --git a/src/libmdsserver/linked-list.c b/src/libmdsserver/linked-list.c
index 0d9f9f0..45f0bd6 100644
--- a/src/libmdsserver/linked-list.c
+++ b/src/libmdsserver/linked-list.c
@@ -273,6 +273,9 @@ static ssize_t linked_list_get_next(linked_list_t* restrict this)
return this->reusable[--(this->reuse_head)];
if (this->end == this->capacity)
{
+ size_t* old_values;
+ ssize_t* old;
+
if ((ssize_t)(this->end) < 0)
{
errno = ENOMEM;
@@ -280,18 +283,30 @@ static ssize_t linked_list_get_next(linked_list_t* restrict this)
}
this->capacity <<= 1;
- this->values = realloc(this->values, this->capacity * sizeof(size_t));
+ this->values = realloc(old_values = this->values, this->capacity * sizeof(size_t));
if (this->values == NULL)
- return LINKED_LIST_UNUSED;
- this->next = realloc(this->next, this->capacity * sizeof(ssize_t));
+ {
+ this->values = old_values;
+ return LINKED_LIST_UNUSED;
+ }
+ this->next = realloc(old = this->next, this->capacity * sizeof(ssize_t));
if (this->next == NULL)
- return LINKED_LIST_UNUSED;
- this->previous = realloc(this->previous, this->capacity * sizeof(ssize_t));
+ {
+ this->next = old;
+ return LINKED_LIST_UNUSED;
+ }
+ this->previous = realloc(old = this->previous, this->capacity * sizeof(ssize_t));
if (this->previous == NULL)
- return LINKED_LIST_UNUSED;
- this->reusable = realloc(this->reusable, this->capacity * sizeof(ssize_t));
+ {
+ this->previous = old;
+ return LINKED_LIST_UNUSED;
+ }
+ this->reusable = realloc(old = this->reusable, this->capacity * sizeof(ssize_t));
if (this->reusable == NULL)
- return LINKED_LIST_UNUSED;
+ {
+ this->reusable = old;
+ return LINKED_LIST_UNUSED;
+ }
}
return (ssize_t)(this->end++);
}