From 50528520af5371f2043ea88766508b2bc958fad4 Mon Sep 17 00:00:00 2001 From: john30 Date: Sat, 3 Jun 2017 10:30:02 +0200 Subject: [PATCH] remove non-alphanum chars from ident for weird ident responses --- src/ebusd/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp index 94572072..bfb95e07 100644 --- a/src/ebusd/main.cpp +++ b/src/ebusd/main.cpp @@ -962,7 +962,7 @@ result_t loadScanConfigFile(MessageMap* messages, symbol_t address, bool verbose prefix.c_str(), getResultCode(result)); auto it = ident.begin(); while (it != ident.end()) { - if (::isspace(*it)) { + if (!::isalnum(*it)) { it = ident.erase(it); } else { *it = static_cast(::tolower(*it)); @@ -994,7 +994,7 @@ result_t loadScanConfigFile(MessageMap* messages, symbol_t address, bool verbose matches = true; break; } - if (remain[remain.length()-1] < '0' || remain[remain.length()-1] > '9') { + if (!::isdigit(remain[remain.length()-1])) { break; } remain.erase(remain.length()-1); // remove trailing digit