diff options
| author | Vladimir Kobal <vlad@prokk.net> | 2019-05-14 18:35:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-14 18:35:12 +0300 |
| commit | 0d5fa83e224afa6d530ed6a5e6e6fe35a8af955e (patch) | |
| tree | 99a1a33870b26e93b18693dc2775888abcd298b6 /streaming | |
| parent | 1833691018fda9eb6b80eed373c482a394a1267e (diff) | |
Fix segmentation fault (#6011)
* Fix segmentation fault
* Make system info printing safe
* Fix quotes for OS name
Diffstat (limited to 'streaming')
| -rw-r--r-- | streaming/rrdpush.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/streaming/rrdpush.c b/streaming/rrdpush.c index 5467b65fb7..2e9050ff28 100644 --- a/streaming/rrdpush.c +++ b/streaming/rrdpush.c @@ -469,20 +469,20 @@ static int rrdpush_sender_thread_connect_to_master(RRDHOST *host, int default_po , default_rrd_update_every , host->os , host->timezone - , (host->tags)?host->tags:"" - , host->system_info->os_name - , host->system_info->os_id - , host->system_info->os_id_like - , host->system_info->os_version - , host->system_info->os_version_id - , host->system_info->os_detection - , host->system_info->kernel_name - , host->system_info->kernel_version - , host->system_info->architecture - , host->system_info->virtualization - , host->system_info->virt_detection - , host->system_info->container - , host->system_info->container_detection + , (host->tags) ? host->tags : "" + , (host->system_info->os_name) ? host->system_info->os_name : "" + , (host->system_info->os_id) ? host->system_info->os_id : "" + , (host->system_info->os_id_like) ? host->system_info->os_id_like : "" + , (host->system_info->os_version) ? host->system_info->os_version : "" + , (host->system_info->os_version_id) ? host->system_info->os_version_id : "" + , (host->system_info->os_detection) ? host->system_info->os_detection : "" + , (host->system_info->kernel_name) ? host->system_info->kernel_name : "" + , (host->system_info->kernel_version) ? host->system_info->kernel_version : "" + , (host->system_info->architecture) ? host->system_info->architecture : "" + , (host->system_info->virtualization) ? host->system_info->virtualization : "" + , (host->system_info->virt_detection) ? host->system_info->virt_detection : "" + , (host->system_info->container) ? host->system_info->container : "" + , (host->system_info->container_detection) ? host->system_info->container_detection : "" , host->program_name , host->program_version ); |