[git commit] libbb: fix potential NULL pointer use

Denys Vlasenko vda.linux at googlemail.com
Mon Sep 3 08:36:51 UTC 2018


commit: https://git.busybox.net/busybox/commit/?id=28d91d754e423fd0df584bbfa9b903eacac21224
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

function                                             old     new   delta
unicode_conv_to_printable2                           193     216     +23

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/unicode.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libbb/unicode.c b/libbb/unicode.c
index 9c4da50d3..d378175a4 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -1121,6 +1121,8 @@ static char* FAST_FUNC unicode_conv_to_printable2(uni_stat_t *stats, const char
 			dst[dst_len++] = ' ';
 		}
 	}
+	if (!dst) /* for example, if input was "" */
+		dst = xzalloc(1);
 	dst[dst_len] = '\0';
 	if (stats) {
 		stats->byte_count = dst_len;


More information about the busybox-cvs mailing list