diff options
author | genofire <geno+dev@fireorbit.de> | 2022-09-08 17:56:12 +0200 |
---|---|---|
committer | Ashod Nakashian <Ashod@users.noreply.github.com> | 2022-09-08 19:54:32 -0400 |
commit | c121f5a8425b98d440cf4b83611c813ffa320e44 (patch) | |
tree | ad875f2c90f922d155fa4224e3cd64056296d90b /wsd | |
parent | Add background to all tabs and add space in between them (diff) | |
download | online-c121f5a8425b98d440cf4b83611c813ffa320e44.tar.gz online-c121f5a8425b98d440cf4b83611c813ffa320e44.zip |
fix(remote_config_pull): nullpointer if alieses not defined in host groups json
Change-Id: c94f0c69d9b31f54c755d10ac964ae8cadc5d4dc
Signed-off-by: genofire <geno+dev@fireorbit.de>
Diffstat (limited to 'wsd')
-rw-r--r-- | wsd/COOLWSD.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/wsd/COOLWSD.cpp b/wsd/COOLWSD.cpp index 3a1b8623b7..a9c1bba7fc 100644 --- a/wsd/COOLWSD.cpp +++ b/wsd/COOLWSD.cpp @@ -1380,14 +1380,17 @@ public: #endif Poco::JSON::Array::Ptr aliases = group->getArray("aliases"); - auto it = aliases->begin(); - size_t j; - for (j = 0; j < aliases->size(); j++) - { - const std::string aliasPath = path + ".alias[" + std::to_string(j) + ']'; - newAppConfig.insert(std::make_pair(aliasPath, it->toString())); - it++; + size_t j = 0; + if (aliases) { + auto it = aliases->begin(); + + for (; j < aliases->size(); j++) + { + const std::string aliasPath = path + ".alias[" + std::to_string(j) + ']'; + newAppConfig.insert(std::make_pair(aliasPath, it->toString())); + it++; + } } for (;; j++) { |