summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRon Yorston2021-09-17 10:16:06 +0100
committerDenys Vlasenko2021-09-17 16:51:01 +0200
commit3a65435eaa845d45bbea176701726f27a88e8498 (patch)
treeb2a3e7df81fffa718389ebad4fe7c90187f21198
parent59ac467dc6429a48522ef7fbe40fcd819563e49a (diff)
downloadbusybox-3a65435eaa845d45bbea176701726f27a88e8498.zip
busybox-3a65435eaa845d45bbea176701726f27a88e8498.tar.gz
libbb: ensure mode_string is NUL terminated
If the mode_string array is no longer static we can't rely on it being NUL terminated. function old new delta bb_mode_string 115 118 +3 Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/mode_string.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/libbb/mode_string.c b/libbb/mode_string.c
index 2b82901..8c12b46 100644
--- a/libbb/mode_string.c
+++ b/libbb/mode_string.c
@@ -66,10 +66,7 @@ char* FAST_FUNC bb_mode_string(char buf[12], mode_t mode)
i += 4;
} while (i < 12);
- /* Note: We don't bother with nul termination because bss initialization
- * should have taken care of that for us. If the user scribbled in buf
- * memory, they deserve whatever happens. But we'll at least assert. */
- assert(buf[10] == 0);
+ buf[10] = '\0';
return buf;
}
@@ -79,7 +76,7 @@ char* FAST_FUNC bb_mode_string(char buf[12], mode_t mode)
/* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C',
* and 'B' types don't appear to be available on linux. So I removed them. */
static const char type_chars[16] ALIGN1 = "?pc?d?b?-?l?s???";
-/********************************** 0123456789abcdef */
+/***************************************** 0123456789abcdef */
static const char mode_chars[7] ALIGN1 = "rwxSTst";
char* FAST_FUNC bb_mode_string(char buf[12], mode_t mode)
@@ -107,10 +104,7 @@ char* FAST_FUNC bb_mode_string(char buf[12], mode_t mode)
}
} while (i < 3);
- /* Note: We don't bother with nul termination because bss initialization
- * should have taken care of that for us. If the user scribbled in buf
- * memory, they deserve whatever happens. But we'll at least assert. */
- assert(buf[10] == 0);
+ buf[10] = '\0';
return buf;
}