[X2Go-Commits] [nx-libs] 01/01: nxcomp/src/Log.h: make sure we don't pass NULL pointers to strstr().

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 56dbc215666f0c0e5bdf316aab31db9b42b6920d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Dec 27 19:49:25 2017 +0100

    nxcomp/src/Log.h: make sure we don't pass NULL pointers to strstr().
---
 nxcomp/src/Log.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nxcomp/src/Log.h b/nxcomp/src/Log.h
index 9781ec8..d0ea627 100644
--- a/nxcomp/src/Log.h
+++ b/nxcomp/src/Log.h
@@ -509,7 +509,14 @@ bool has_newline(T value)
 template <char*>
 static bool has_newline(char *value)
 {
-    return strstr(value, "\n") != NULL;
+    if (value)
+    {
+        return strstr(value, "\n") != NULL;
+    }
+    else
+    {
+        return false;
+    }
 }
 
 template <char>

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git