From: Lukas Czerner Date: Fri, 5 Jun 2020 08:14:40 +0000 (+0200) Subject: e2fsck: use size_t instead of int in string_copy() X-Git-Tag: v1.45.7~42 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0c6fe31f328e7244164d8a954488f5738caaf915;p=tools%2Fe2fsprogs.git e2fsck: use size_t instead of int in string_copy() len argument in string_copy() is int, but it is used with malloc(), strlen(), strncpy() and some callers use sizeof() to pass value in. So it really ought to be size_t rather than int. Fix it. Signed-off-by: Lukas Czerner Reviewed-by: Andreas Dilger Signed-off-by: Theodore Ts'o --- diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h index feb605c..7e0895c 100644 --- a/e2fsck/e2fsck.h +++ b/e2fsck/e2fsck.h @@ -608,7 +608,7 @@ extern void log_err(e2fsck_t ctx, const char *fmt, ...) extern void e2fsck_read_bitmaps(e2fsck_t ctx); extern void e2fsck_write_bitmaps(e2fsck_t ctx); extern void preenhalt(e2fsck_t ctx); -extern char *string_copy(e2fsck_t ctx, const char *str, int len); +extern char *string_copy(e2fsck_t ctx, const char *str, size_t len); extern int fs_proc_check(const char *fs_name); extern int check_for_modules(const char *fs_name); #ifdef RESOURCE_TRACK diff --git a/e2fsck/util.c b/e2fsck/util.c index 8cebd95..425fe88 100644 --- a/e2fsck/util.c +++ b/e2fsck/util.c @@ -135,7 +135,7 @@ void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned long size, } char *string_copy(e2fsck_t ctx EXT2FS_ATTR((unused)), - const char *str, int len) + const char *str, size_t len) { char *ret;