From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 18 Jun 2019 13:56:07 +0000 (+0200)
Subject: journald: use memdup_suffix0() when copying string from potentially binary data
X-Git-Tag: v243-rc1~269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9adc8a8636f48e7f33371fc97cf9388744ff3a1;p=thirdparty%2Fsystemd.git

journald: use memdup_suffix0() when copying string from potentially binary data

Fixes: #12484
---

diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index 4efe34c6646..73a96da9f7a 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -63,7 +63,7 @@ static void server_process_entry_meta(
                  startswith(p, "SYSLOG_IDENTIFIER=")) {
                 char *t;
 
-                t = strndup(p + 18, l - 18);
+                t = memdup_suffix0(p + 18, l - 18);
                 if (t) {
                         free(*identifier);
                         *identifier = t;
@@ -73,7 +73,7 @@ static void server_process_entry_meta(
                    startswith(p, "MESSAGE=")) {
                 char *t;
 
-                t = strndup(p + 8, l - 8);
+                t = memdup_suffix0(p + 8, l - 8);
                 if (t) {
                         free(*message);
                         *message = t;