Merge pull request #859 from mattmundell/hosts-ordering

Prevent HOSTS_ORDERING from being '(null)'
greenbone · Nov 6, 2019 · 5ca7681 · 5ca7681
2 parents 5e0b7cd + 3840e72
commit 5ca7681
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Escaping correctly the percent sign in sql statements  [#818](https://github.com/greenbone/gvmd/pull/818)
 - Remove incorrect duplicates from config preference migrator [#830](https://github.com/greenbone/gvmd/pull/830)
 - MODIFY_USER saves comment when COMMENT is empty [#838](https://github.com/greenbone/gvmd/pull/838)
+- Prevent HOSTS_ORDERING from being '(null)' [#859](https://github.com/greenbone/gvmd/pull/859)
 
 ### Removed
 - Remove support for "All SecInfo": removal of "allinfo" for type in get_info [#790](https://github.com/greenbone/gvmd/pull/790)

diff --git a/src/gmp.c b/src/gmp.c
@@ -18870,7 +18870,9 @@ handle_get_tasks (gmp_parser_t *gmp_parser, GError **error)
                        task_target_name_escaped ?: "",
                        target_in_trash,
                        target_available ? "" : "<permissions/>",
-                       task_iterator_hosts_ordering (&tasks),
+                       task_iterator_hosts_ordering (&tasks)
+                        ? task_iterator_hosts_ordering (&tasks)
+                        : "",
                        task_scanner_uuid,
                        task_scanner_name_escaped,
                        task_scanner_type,