[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openvas-cvs
Subject:    [Openvas-commits] r24263 - in branches/gsa-6.0: . src
From:       scm-commit () wald ! intevation ! org
Date:       2016-01-31 12:44:30
Message-ID: 20160131124430.925019A18EA5 () wald ! intevation ! org
[Download RAW message or body]

Author: mattm
Date: 2016-01-31 13:44:30 +0100 (Sun, 31 Jan 2016)
New Revision: 24263

Modified:
   branches/gsa-6.0/ChangeLog
   branches/gsa-6.0/src/gsad.c
Log:
	Backport r24261.

	* src/gsad.c (request_handler): Check that params has been setup before
	accessing param "cmd", because in some cases params is still NULL.
	Prevents a Glib critical error due to accessing NULL as a hashtable.

Modified: branches/gsa-6.0/ChangeLog
===================================================================
--- branches/gsa-6.0/ChangeLog	2016-01-31 12:31:18 UTC (rev 24262)
+++ branches/gsa-6.0/ChangeLog	2016-01-31 12:44:30 UTC (rev 24263)
@@ -1,3 +1,11 @@
+2016-01-31  Matthew Mundell <matthew.mundell@greenbone.net>
+
+	Backport r24261.
+
+	* src/gsad.c (request_handler): Check that params has been setup before
+	accessing param "cmd", because in some cases params is still NULL.
+	Prevents a Glib critical error due to accessing NULL as a hashtable.
+
 2016-01-13  Timo Pollmeier <timo.pollmeier@greenbone.net>
 
 	Backport r24112.

Modified: branches/gsa-6.0/src/gsad.c
===================================================================
--- branches/gsa-6.0/src/gsad.c	2016-01-31 12:31:18 UTC (rev 24262)
+++ branches/gsa-6.0/src/gsad.c	2016-01-31 12:44:30 UTC (rev 24263)
@@ -4233,7 +4233,12 @@
       if (response)
         {
           const char* cmd;
-          cmd = params_value (credentials->params, "cmd");
+
+          if (credentials->params)
+            cmd = params_value (credentials->params, "cmd");
+          else
+            cmd = NULL;
+
           if (attach_sid (response, sid) == MHD_NO)
             {
               g_free (sid);

_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
[prev in list] [next in list] [prev in thread] [next in thread]