aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-09-06 11:25:14 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-01-04 12:58:45 +0100
commitbf19b5fdcde6bae47a17e6173f57f0606a8bd0e9 (patch)
tree7842c06d553c8a2d7407354f2e53d0a5834d919c
parent9bb04ec133b30fd106782b2105b8edca93b052e6 (diff)
downloadglibc-bf19b5fdcde6bae47a17e6173f57f0606a8bd0e9.tar
glibc-bf19b5fdcde6bae47a17e6173f57f0606a8bd0e9.tar.gz
glibc-bf19b5fdcde6bae47a17e6173f57f0606a8bd0e9.tar.bz2
glibc-bf19b5fdcde6bae47a17e6173f57f0606a8bd0e9.zip
__libc_dynarray_emplace_enlarge: Add missing else
Before, arrays of small elements received a starting allocation size of 8, not 16. (cherry picked from commit ab5ac271e6210fa0af11cf3ca525ce573bc47c48)
-rw-r--r--ChangeLog5
-rw-r--r--malloc/dynarray_emplace_enlarge.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 66b74d4728..0cc6ac6508 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-06 Florian Weimer <fweimer@redhat.com>
+
+ * malloc/dynarray_emplace_enlarge.c
+ (__libc_dynarray_emplace_enlarge): Add missing else.
+
2017-08-30 Florian Weimer <fweimer@redhat.com>
* malloc/dynarray_emplace_enlarge.c
diff --git a/malloc/dynarray_emplace_enlarge.c b/malloc/dynarray_emplace_enlarge.c
index 0fb032765c..a15245f4cb 100644
--- a/malloc/dynarray_emplace_enlarge.c
+++ b/malloc/dynarray_emplace_enlarge.c
@@ -33,7 +33,7 @@ __libc_dynarray_emplace_enlarge (struct dynarray_header *list,
size. */
if (element_size < 4)
new_allocated = 16;
- if (element_size < 8)
+ else if (element_size < 8)
new_allocated = 8;
else
new_allocated = 4;