forked from rpms/e2fsprogs
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
|
From 8a97e4f67f75a4584f7562b7e5d866431c88152e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lukas Czerner <lczerner@redhat.com>
|
||
|
|
Date: Fri, 5 Jun 2020 10:14:40 +0200
|
||
|
|
Subject: [PATCH 09/46] e2fsck: use size_t instead of int in string_copy()
|
||
|
|
Content-Type: text/plain
|
||
|
|
|
||
|
|
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 <lczerner@redhat.com>
|
||
|
|
Reviewed-by: Andreas Dilger <adilger@dilger.ca>
|
||
|
|
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
||
|
|
---
|
||
|
|
e2fsck/e2fsck.h | 2 +-
|
||
|
|
e2fsck/util.c | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
|
||
|
|
index feb605c7..7e0895c2 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 d98b8e47..88e0ea8a 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;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.35.1
|
||
|
|
|