Skip to content

GitLab

Notice to GitKraken users: A vulnerability has been found in the SSH key generation of GitKraken versions 7.6.0 to 8.0.0 (https://www.gitkraken.com/blog/weak-ssh-key-fix). If you use GitKraken and have generated a SSH key using one of these versions, please remove it both from your local workstation and from your LRZ GitLab profile.

21.10.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit db1fb0ce authored by Michael Ott's avatar Michael Ott
Browse files

Check for valid entity pointer in constructSensorTopics()

parent a3f7e7a8
Hide whitespace changes
Inline Side-by-side
dcdbpusher/includes/ConfiguratorTemplateEntity.h
View file @ db1fb0ce
......@@ -465,11 +465,14 @@ class ConfiguratorTemplateEntity : public ConfiguratorTemplate<SBase, SGroup> {
// Sensor names are adjusted according to the respective MQTT topics
for (auto &g : _sensorGroups) {
for (auto &s : g->acquireSensors()) {
s->setMqtt(MQTTChecker::formatTopic(_mqttPrefix) +
MQTTChecker::formatTopic(g->getEntity()->getMqttPart()) +
MQTTChecker::formatTopic(g->getMqttPart()) +
MQTTChecker::formatTopic(s->getMqtt()));
s->setName(s->getMqtt());
std::string mqtt = MQTTChecker::formatTopic(_mqttPrefix);
if (g->getEntity()) {
mqtt.append(MQTTChecker::formatTopic(g->getEntity()->getMqttPart()));
}
mqtt.append(MQTTChecker::formatTopic(g->getMqttPart()));
mqtt.append(MQTTChecker::formatTopic(s->getMqtt()));
s->setMqtt(mqtt);
s->setName(mqtt);
SensorMetadata *sm = s->getMetadata();
if (sm) {
sm->setPublicName(s->getMqtt());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment