aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 2b829016f..8c12b4684 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)
66 i += 4; 66 i += 4;
67 } while (i < 12); 67 } while (i < 12);
68 68
69 /* Note: We don't bother with nul termination because bss initialization 69 buf[10] = '\0';
70 * should have taken care of that for us. If the user scribbled in buf
71 * memory, they deserve whatever happens. But we'll at least assert. */
72 assert(buf[10] == 0);
73 70
74 return buf; 71 return buf;
75} 72}
@@ -79,7 +76,7 @@ char* FAST_FUNC bb_mode_string(char buf[12], mode_t mode)
79/* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C', 76/* The previous version used "0pcCd?bB-?l?s???". However, the '0', 'C',
80 * and 'B' types don't appear to be available on linux. So I removed them. */ 77 * and 'B' types don't appear to be available on linux. So I removed them. */
81static const char type_chars[16] ALIGN1 = "?pc?d?b?-?l?s???"; 78static const char type_chars[16] ALIGN1 = "?pc?d?b?-?l?s???";
82/********************************** 0123456789abcdef */ 79/***************************************** 0123456789abcdef */
83static const char mode_chars[7] ALIGN1 = "rwxSTst"; 80static const char mode_chars[7] ALIGN1 = "rwxSTst";
84 81
85char* FAST_FUNC bb_mode_string(char buf[12], mode_t mode) 82char* 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)
107 } 104 }
108 } while (i < 3); 105 } while (i < 3);
109 106
110 /* Note: We don't bother with nul termination because bss initialization 107 buf[10] = '\0';
111 * should have taken care of that for us. If the user scribbled in buf
112 * memory, they deserve whatever happens. But we'll at least assert. */
113 assert(buf[10] == 0);
114 108
115 return buf; 109 return buf;
116} 110}