Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-09-27 14:22:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Always zero terminate payloads (removes uhpa support)

Browse Source
This commit is contained in:
Roger A. Light
2020-11-24 12:24:40 +00:00
parent 5db971a0e9
commit adfa9f1e21
17 changed files with 49 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/db_dump/db_dump.c
+4 -4
View File
@@ -98,7 +98,7 @@ static void free__msg_store(struct P_msg_store *chunk)
{
//free(chunk->source_id);
free(chunk->topic);
UHPA_FREE(chunk->payload, chunk->F.payloadlen);
free(chunk->payload);
mosquitto_property_free_all(&chunk->properties);
}
@@ -252,7 +252,7 @@ static int dump__msg_store_chunk_process(FILE *db_fptr, uint32_t length)
mosquitto__free(chunk.source.id);
mosquitto__free(chunk.source.username);
mosquitto__free(chunk.topic);
UHPA_FREE(chunk.payload, chunk.F.payloadlen);
mosquitto__free(chunk.payload);
log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
return MOSQ_ERR_NOMEM;
}
@@ -275,7 +275,7 @@ static int dump__msg_store_chunk_process(FILE *db_fptr, uint32_t length)
mosquitto__free(chunk.source.id);
mosquitto__free(chunk.source.username);
mosquitto__free(chunk.topic);
UHPA_FREE(chunk.payload, chunk.F.payloadlen);
mosquitto__free(chunk.payload);
return MOSQ_ERR_NOMEM;
}
stored->source_mid = chunk.F.source_mid;
@@ -283,7 +283,7 @@ static int dump__msg_store_chunk_process(FILE *db_fptr, uint32_t length)
stored->qos = chunk.F.qos;
stored->retain = chunk.F.retain;
stored->payloadlen = chunk.F.payloadlen;
UHPA_MOVE(stored->payload, chunk.payload, chunk.F.payloadlen);
stored->payload = chunk.payload;
stored->properties = chunk.properties;
rc = db__message_store(&chunk.source, stored, message_expiry_interval,
apps/db_dump/print.c
+1 -1
View File
@@ -190,7 +190,7 @@ void print__msg_store(struct P_msg_store *chunk, int length)
uint8_t *payload;
payload = UHPA_ACCESS(chunk->payload, chunk->F.payloadlen);
payload = chunk->payload;
if(chunk->F.payloadlen < 256){
/* Print payloads with UTF-8 data below an arbitrary limit of 256 bytes */
if(mosquitto_validate_utf8((char *)payload, (uint16_t)chunk->F.payloadlen) == MOSQ_ERR_SUCCESS){