diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 12:20:30 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-13 12:20:30 +0000 |
commit | 83b327169ee372115441eea6df825165573a0aa0 (patch) | |
tree | bc65883721c11623acb6dbb36b3c515c6cc6ec8f /include/import/ist.h | |
parent | Adding debian version 2.9.6-1. (diff) | |
download | haproxy-83b327169ee372115441eea6df825165573a0aa0.tar.xz haproxy-83b327169ee372115441eea6df825165573a0aa0.zip |
Merging upstream version 2.9.7.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'include/import/ist.h')
-rw-r--r-- | include/import/ist.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/import/ist.h b/include/import/ist.h index 16b8616..e4e1425 100644 --- a/include/import/ist.h +++ b/include/import/ist.h @@ -939,15 +939,12 @@ static inline void istfree(struct ist *ist) */ static inline struct ist istdup(const struct ist src) { - const size_t src_size = src.len; - - /* Allocate at least 1 byte to allow duplicating an empty string with - * malloc implementations that return NULL for a 0-size allocation. - */ - struct ist dst = istalloc(src_size ? src_size : 1); + /* Allocate 1 extra byte to add an extra \0 delimiter. */ + struct ist dst = istalloc(src.len + 1); if (isttest(dst)) { - istcpy(&dst, src, src_size); + istcpy(&dst, src, src.len); + dst.ptr[dst.len] = '\0'; } return dst; |