v3.37

Author: pvtom

README.md

@@ -160,7 +160,7 @@ or to show the help page
 If everything works properly, you will see something like this:
 
 ```
-rscp2mqtt [3.36]
+rscp2mqtt [3.37]
 E3DC system >192.168.178.111:5033< user: >your E3DC user<
 MQTT broker >localhost:1883< qos = >0< retain = >✗< tls >✗< client id >✗< prefix >e3dc<
 Requesting PVI ✓ | PM (0) | DCB ✓ (1 battery string) | Wallbox ✗ | Interval 2 | Autorefresh ✓ | Raw data ✗ | Logging OFF

RELEASE.md

@@ -1,5 +1,11 @@
 ## Release Notes
 
+### Release v3.37 (12.04.2025)
+
+Bug fixes:
+- Issue #106: Unexpected program crash when using raw mode
+- Issue #107: Memory leak in v3.36
+
 ### Release v3.36 (29.03.2025)
 
 Features:

RscpMqttMain.cpp

@@ -22,7 +22,7 @@
 #include <regex>
 #include <mutex>
 
-#define RSCP2MQTT_VERSION       "3.36"
+#define RSCP2MQTT_VERSION       "3.37"
 
 #define AES_KEY_SIZE            32
 #define AES_BLOCK_SIZE          32
@@ -126,7 +126,13 @@ char *tagName(std::vector<RSCP_TAGS::tag_overview_t> & v, uint32_t tag) {
             return(it->name);
         }
     }
-    return(NULL); 
+    char name[128];
+    sprintf(name, "0x%02X", tag);
+    RSCP_TAGS::tag_overview_t tag_overview = { tag, "", 0 };
+    strcpy(tag_overview.name, name);
+    RSCP_TAGS::RscpTagsOverview.push_back(tag_overview);
+    logMessage(cfg.logfile, (char *)__FILE__, __LINE__, (char *)"tagName: new tag >%s<\n", name);
+    return(tagName(v, tag));
 }
 
 uint32_t tagID(std::vector<RSCP_TAGS::tag_overview_t> & v, char *name) {
@@ -148,12 +154,14 @@ bool isTag(std::vector<RSCP_TAGS::tag_overview_t> & v, char *name, bool must_be_
 }
 
 char *typeName(std::vector<RSCP_TAGS::rscp_types_t> & v, uint8_t code) {
+    char *unknown = NULL;
     for (std::vector<RSCP_TAGS::rscp_types_t>::iterator it = v.begin(); it != v.end(); ++it) {
+        if (!it->code) unknown = it->type;
         if (it->code == code) {
             return(it->type);
         }
     }
-    return(NULL);
+    return(unknown);
 }
 
 uint8_t typeID(std::vector<RSCP_TAGS::rscp_types_t> & v, char *type) {
@@ -870,7 +878,7 @@ int mergeRawData(char *topic, char *payload, bool *changed) {
             if (!strcmp(it->topic, topic) && !it->handled && (i == it->nr)) {
                 if (strcmp(it->payload, payload)) {
                     if (strlen(it->payload) != strlen(payload)) it->payload = (char *)realloc(it->payload, strlen(payload) + 1);
-                    strcpy(it->payload, payload);
+                    if (it->payload) strcpy(it->payload, payload);
                     it->changed = true;
                     *changed = true;
                 }
@@ -2125,18 +2133,20 @@ void publishRaw(RscpProtocol *protocol, SRscpValue *response, char *topic_in) {
     char topic[TOPIC_SIZE];
     char *payload = (char *)malloc(PAYLOAD_SIZE * sizeof(char) + 1);
     bool changed = false;
-    memset(payload, 0, PAYLOAD_SIZE);
-    preparePayload(protocol, response, &payload);
+    if (payload) {
+        memset(payload, 0, PAYLOAD_SIZE);
+        preparePayload(protocol, response, &payload);
 
-    int nr = mergeRawData(topic_in, payload, &changed);
-    if (nr > 0) {
-        if (snprintf(topic, TOPIC_SIZE, "%s/%d", topic_in, nr) >= TOPIC_SIZE) {
-            logMessage(cfg.logfile, (char *)__FILE__, __LINE__, (char *)"publishRaw: Buffer overflow\n");
-            return;
-        }
-        if (changed) publishImmediately(topic, payload, false);
-    } else if (changed) publishImmediately(topic_in, payload, false);
-    if (payload) free(payload);
+        int nr = mergeRawData(topic_in, payload, &changed);
+        if (nr > 0) {
+            if (snprintf(topic, TOPIC_SIZE, "%s/%d", topic_in, nr) >= TOPIC_SIZE) {
+                logMessage(cfg.logfile, (char *)__FILE__, __LINE__, (char *)"publishRaw: Buffer overflow\n");
+                return;
+            }
+            if (changed) publishImmediately(topic, payload, false);
+        } else if (changed) publishImmediately(topic_in, payload, false);
+        free(payload);
+    }
     return;
 }
 
@@ -2325,6 +2335,7 @@ int handleResponseValue(RscpProtocol *protocol, SRscpValue *response) {
                                             if (storeResponseValue(RSCP_MQTT::RscpMqttCache, protocol, &(subcontainer[k]), containerData[i].tag, dcb_nr) < 0) break;
                                         }
                                     }
+                                    protocol->destroyValueData(subcontainer); // Issue #107
                                 }
                             }
                         }
@@ -3614,6 +3625,11 @@ int main(int argc, char *argv[]) {
         logMessageCache(cfg.logfile, false);
     }
 
+    for (std::vector<RSCP_MQTT::raw_data_t>::iterator it = RSCP_MQTT::rawData.begin(); it != RSCP_MQTT::rawData.end(); ++it) {
+        if (it->topic) free(it->topic);
+        if (it->payload) free(it->payload);
+    }
+
     RSCP_MQTT::RscpMqttCache.clear();
     RSCP_MQTT::RscpMqttCacheTempl.clear();
     RSCP_MQTT::RscpMqttReceiveCache.clear();
@@ -3623,6 +3639,7 @@ int main(int argc, char *argv[]) {
     RSCP_MQTT::TopicStore.clear();
     RSCP_MQTT::IdlePeriodCache.clear();
     RSCP_MQTT::ErrorCache.clear();
+    RSCP_MQTT::rawData.clear();
 
     // MQTT disconnect
     mosquitto_disconnect(mosq);
@@ -3638,6 +3655,7 @@ int main(int argc, char *argv[]) {
     if (cfg.curl_opt_cainfo) free(cfg.curl_opt_cainfo);
     if (cfg.curl_opt_sslcert) free (cfg.curl_opt_sslcert);
     if (cfg.curl_opt_sslkey) free(cfg.curl_opt_sslkey);
+    if (cfg.curl_protocol) free(cfg.curl_protocol);
 #endif
 
     if (cfg.logfile) free(cfg.logfile);

RscpProtocol.cpp

@@ -291,12 +291,12 @@ bool RscpProtocol::allocateMemory(SRscpValue* value, size_t size)  {
 		if(size == 0) {
 			return true;
 		}
-		value->data = (uint8_t *) malloc(size);
+                value->data = (uint8_t *) malloc(size + 8); //fix?
 		return (value->data != NULL);
 	}
 	else {
 		// if data is already allocated -> reallocate to the correct size
-		uint8_t *ucTmp = (uint8_t *) realloc(value->data, size);
+                uint8_t *ucTmp = (uint8_t *) realloc(value->data, size + 8); //fix?
 		if(ucTmp != NULL) {
 			value->data = ucTmp;
 			return true;
@@ -375,7 +375,7 @@ int32_t RscpProtocol::parseData(const uint8_t* data, const uint32_t & length, st
 		newVal.length = value->length;
 		if(value->length > 0) {
 			// allocate data memory for each value separately
-			newVal.data = (uint8_t *) malloc(value->length);
+                        newVal.data = (uint8_t *) malloc(value->length + 8); //fix?
 			if(newVal.data == NULL) {
 				// not enough memory, return only what parsed until now
 				destroyValueData(vecValues);