path: root/src/basic/string-util.h
diff options
authorLennart Poettering <>2018-04-27 14:09:31 +0200
committerSven Eden <>2018-08-24 16:47:08 +0200
commit94062cd7c9680c5e9870f4352fcd5f0db2e51dfd (patch)
tree5485ca50514dcf5f3efa5e73cfaf1c3be771afb7 /src/basic/string-util.h
parent338c3c3619a265a1928184d9e8dfdf5219537b66 (diff)
tree-wide: be more careful with the type of array sizes
Previously we were a bit sloppy with the index and size types of arrays, we'd regularly use unsigned. While I don't think this ever resulted in real issues I think we should be more careful there and follow a stricter regime: unless there's a strong reason not to use size_t for array sizes and indexes, size_t it should be. Any allocations we do ultimately will use size_t anyway, and converting forth and back between unsigned and size_t will always be a source of problems. Note that on 32bit machines "unsigned" and "size_t" are equivalent, and on 64bit machines our arrays shouldn't grow that large anyway, and if they do we have a problem, however that kind of overly large allocation we have protections for usually, but for overflows we do not have that so much, hence let's add it. So yeah, it's a story of the current code being already "good enough", but I think some extra type hygiene is better. This patch tries to be comprehensive, but it probably isn't and I missed a few cases. But I guess we can cover that later as we notice it. Among smaller fixes, this changes: 1. strv_length()' return type becomes size_t 2. the unit file changes array size becomes size_t 3. DNS answer and query array sizes become size_t Fixes:
Diffstat (limited to 'src/basic/string-util.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/basic/string-util.h b/src/basic/string-util.h
index ea5f453f2..4270d3091 100644
--- a/src/basic/string-util.h
+++ b/src/basic/string-util.h
@@ -113,7 +113,7 @@ char *strjoin_real(const char *x, ...) _sentinel_;
const char *_appendees_[] = { a, __VA_ARGS__ }; \
char *_d_, *_p_; \
size_t _len_ = 0; \
- unsigned _i_; \
+ size_t _i_; \
for (_i_ = 0; _i_ < ELEMENTSOF(_appendees_) && _appendees_[_i_]; _i_++) \
_len_ += strlen(_appendees_[_i_]); \
_p_ = _d_ = alloca(_len_ + 1); \