From: Daniel P. Berrange <berrange@redhat.com>
Date: Fri, 2 Aug 2013 11:15:57 +0000 (+0100)
Subject: Avoid crash if NULL is passed for filename/funcname in logging
X-Git-Tag: CVE-2013-4239~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4ca2999020ab4adf7a73ccbff1de2b40a097874;p=thirdparty%2Flibvirt.git

Avoid crash if NULL is passed for filename/funcname in logging

The journald code would crash if a NULL was passed for the
filename / funcname in the logging code. This shouldn't
happen in general, but it is better to be safe, since there
have been bugs triggering this.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/util/virlog.c b/src/util/virlog.c
index d1fb0b320c..047a131666 100644
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -1181,9 +1181,11 @@ virLogOutputToJournald(virLogSource source,
     journalAddInt(&state, "PRIORITY", priority);
     journalAddString(&state, "LIBVIRT_SOURCE",
                      virLogSourceTypeToString(source));
-    journalAddString(&state, "CODE_FILE", filename);
+    if (filename)
+        journalAddString(&state, "CODE_FILE", filename);
     journalAddInt(&state, "CODE_LINE", linenr);
-    journalAddString(&state, "CODE_FUNC", funcname);
+    if (funcname)
+        journalAddString(&state, "CODE_FUNC", funcname);
 
     memset(&sa, 0, sizeof(sa));
     sa.sun_family = AF_UNIX;