This series is primarily about the first two patches to convert our iconv helpers to use size_t consistently. I posted them to the git-security list a while back, wondering if there was something sneaky you could do here. But after some discussion, the consensus was no, you can't. The other four patches are just semi-related cleanups I saw while poking around the strbuf code. I doubt any of them fixes a user-visible bug, but I think they're worth doing (and they don't seem to conflict with anything on pu). [1/6]: reencode_string: use st_add/st_mult helpers [2/6]: reencode_string: use size_t for string lengths [3/6]: strbuf: use size_t for length in intermediate variables [4/6]: strbuf_readlink: use ssize_t [5/6]: pass st.st_size as hint for strbuf_readlink() [6/6]: strbuf_humanise: use unsigned variables builtin/init-db.c | 3 ++- convert.c | 6 +++--- pretty.c | 2 +- refs/files-backend.c | 2 +- strbuf.c | 20 ++++++++++---------- utf8.c | 10 +++++----- utf8.h | 10 +++++----- 7 files changed, 27 insertions(+), 26 deletions(-) -Peff