From d2cd98928c29d125a0afebfc2e82af9137288b05 Mon Sep 17 00:00:00 2001 From: "nshero.lee" Date: Tue, 2 Jan 2018 12:03:17 +0900 Subject: [PATCH] Fixed excption when it prints logs In case of dynamic allocation, it needs to check memory and print out It was missed and added it before printing logs Signed-off-by: nshero.lee --- src/input_file.c | 2 +- src/setup_network.c | 45 +++++++++++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/input_file.c b/src/input_file.c index 58b9587..7af633c 100644 --- a/src/input_file.c +++ b/src/input_file.c @@ -256,7 +256,7 @@ static void print_config_info(sa_config_s *config) { print_network_config(config->networkData); } - if(config->networkData) + if(config->systemData) { print_system_config(config->systemData); } diff --git a/src/setup_network.c b/src/setup_network.c index e9523e1..8c1ebfe 100644 --- a/src/setup_network.c +++ b/src/setup_network.c @@ -648,24 +648,33 @@ static sa_error_e __network_connect(sa_network_s *info) if (info == NULL) { return SA_ERROR_INVALID_PARAMETER; } else { - _D("----------- wifi info -----------"); - _D("info|wifi|enabled(%d)", info->wifi->enabled); - _D("info|wifi|dhcpEnabled(%d)", info->wifi->dhcpEnabled); - _D("info|wifi|ssid(%s)", info->wifi->ssid); - _D("info|wifi|password(%s)", info->wifi->password); - _D("info|wifi|staticInfo|ipAddress(%s)", info->wifi->staticInfo->ipAddress); - _D("info|wifi|staticInfo|netmask(%s)", info->wifi->staticInfo->netmask); - _D("info|wifi|staticInfo|defaultGateway(%s)", info->wifi->staticInfo->defaultGateway); - _D("info|wifi|staticInfo|primaryDnsServer(%s)", info->wifi->staticInfo->primaryDnsServer); - _D("info|wifi|staticInfo|secondaryDnsServer(%s)", info->wifi->staticInfo->secondaryDnsServer); - _D("----------- ethernet info -----------"); - _D("info|eth|enabled(%d)", info->eth->enabled); - _D("info|eth|dhcpEnabled(%d)", info->eth->dhcpEnabled); - _D("info|eth|staticInfo|ipAddress(%s)", info->eth->staticInfo->ipAddress); - _D("info|eth|staticInfo|netmask(%s)", info->eth->staticInfo->netmask); - _D("info|eth|staticInfo|defaultGateway(%s)", info->eth->staticInfo->defaultGateway); - _D("info|eth|staticInfo|primaryDnsServer(%s)", info->eth->staticInfo->primaryDnsServer); - _D("info|eth|staticInfo|secondaryDnsServer(%s)", info->eth->staticInfo->secondaryDnsServer); + if (info->wifi != NULL) { + _D("----------- wifi info -----------"); + _D("info|wifi|enabled(%d)", info->wifi->enabled); + _D("info|wifi|dhcpEnabled(%d)", info->wifi->dhcpEnabled); + _D("info|wifi|ssid(%s)", info->wifi->ssid); + _D("info|wifi|password(%s)", info->wifi->password); + if (info->wifi->staticInfo != NULL) { + _D("info|wifi|staticInfo|ipAddress(%s)", info->wifi->staticInfo->ipAddress); + _D("info|wifi|staticInfo|netmask(%s)", info->wifi->staticInfo->netmask); + _D("info|wifi|staticInfo|defaultGateway(%s)", info->wifi->staticInfo->defaultGateway); + _D("info|wifi|staticInfo|primaryDnsServer(%s)", info->wifi->staticInfo->primaryDnsServer); + _D("info|wifi|staticInfo|secondaryDnsServer(%s)", info->wifi->staticInfo->secondaryDnsServer); + } + } + + if (info->eth != NULL) { + _D("----------- ethernet info -----------"); + _D("info|eth|enabled(%d)", info->eth->enabled); + _D("info|eth|dhcpEnabled(%d)", info->eth->dhcpEnabled); + if (info->eth->staticInfo != NULL) { + _D("info|eth|staticInfo|ipAddress(%s)", info->eth->staticInfo->ipAddress); + _D("info|eth|staticInfo|netmask(%s)", info->eth->staticInfo->netmask); + _D("info|eth|staticInfo|defaultGateway(%s)", info->eth->staticInfo->defaultGateway); + _D("info|eth|staticInfo|primaryDnsServer(%s)", info->eth->staticInfo->primaryDnsServer); + _D("info|eth|staticInfo|secondaryDnsServer(%s)", info->eth->staticInfo->secondaryDnsServer); + } + } } if (info->eth != NULL) { -- 2.34.1