summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorDenys Vlasenko2022-01-05 23:02:13 +0100
committerDenys Vlasenko2022-01-05 23:03:54 +0100
commit6062c0d19bc201cbeb61b8875598cdd7a14a5ae0 (patch)
tree0dbe9b5d8b0f97c3a7e23d28d7a6a9735abfce42 /libbb
parentdb5546ca101846f18294a43b39883bc4ff53613a (diff)
downloadbusybox-6062c0d19bc201cbeb61b8875598cdd7a14a5ae0.zip
busybox-6062c0d19bc201cbeb61b8875598cdd7a14a5ae0.tar.gz
libbb: change xstrndup, xmemdup to take size_t as size parameter
Also, remove entirely usually-disabled paranoia check (was also using wrong config option to enable itself). Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r--libbb/xfuncs_printf.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index d29aceb..fc630d1 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -91,13 +91,10 @@ char* FAST_FUNC xstrdup(const char *s)
// Die if we can't allocate n+1 bytes (space for the null terminator) and copy
// the (possibly truncated to length n) string into it.
-char* FAST_FUNC xstrndup(const char *s, int n)
+char* FAST_FUNC xstrndup(const char *s, size_t n)
{
char *t;
- if (ENABLE_DEBUG && s == NULL)
- bb_simple_error_msg_and_die("xstrndup bug");
-
t = strndup(s, n);
if (t == NULL)
@@ -106,7 +103,7 @@ char* FAST_FUNC xstrndup(const char *s, int n)
return t;
}
-void* FAST_FUNC xmemdup(const void *s, int n)
+void* FAST_FUNC xmemdup(const void *s, size_t n)
{
return memcpy(xmalloc(n), s, n);
}