Merge pull request #2551 from cesanta/mqttpayload

scaprile · web-flow · commit bd5e4dba262f · 2023-12-29T15:13:02.000-03:00
Avoid calling mg_send on no actual payload
diff --git a/mongoose.c b/mongoose.c
@@ -3990,7 +3990,7 @@ void mg_mqtt_pub(struct mg_connection *c, const struct mg_mqtt_opts *opts) {
 
   if (c->is_mqtt5) mg_send_mqtt_properties(c, opts->props, opts->num_props);
 
-  mg_send(c, opts->message.ptr, opts->message.len);
+  if (opts->message.len > 0) mg_send(c, opts->message.ptr, opts->message.len);
 }
 
 void mg_mqtt_sub(struct mg_connection *c, const struct mg_mqtt_opts *opts) {
diff --git a/src/mqtt.c b/src/mqtt.c
@@ -338,7 +338,7 @@ void mg_mqtt_pub(struct mg_connection *c, const struct mg_mqtt_opts *opts) {
 
   if (c->is_mqtt5) mg_send_mqtt_properties(c, opts->props, opts->num_props);
 
-  mg_send(c, opts->message.ptr, opts->message.len);
+  if (opts->message.len > 0) mg_send(c, opts->message.ptr, opts->message.len);
 }
 
 void mg_mqtt_sub(struct mg_connection *c, const struct mg_mqtt_opts *opts) {

Original file line number	Diff line number	Diff line change
`@@ -3990,7 +3990,7 @@ void mg_mqtt_pub(struct mg_connection c, const struct mg_mqtt_opts opts) {`
`3990`	`3990`
`3991`	`3991`	`if (c->is_mqtt5) mg_send_mqtt_properties(c, opts->props, opts->num_props);`
`3992`	`3992`
`3993`		`- mg_send(c, opts->message.ptr, opts->message.len);`
	`3993`	`+ if (opts->message.len > 0) mg_send(c, opts->message.ptr, opts->message.len);`
`3994`	`3994`	`}`
`3995`	`3995`
`3996`	`3996`	`void mg_mqtt_sub(struct mg_connection c, const struct mg_mqtt_opts opts) {`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ void mg_mqtt_pub(struct mg_connection c, const struct mg_mqtt_opts opts) {`
`338`	`338`
`339`	`339`	`if (c->is_mqtt5) mg_send_mqtt_properties(c, opts->props, opts->num_props);`
`340`	`340`
`341`		`- mg_send(c, opts->message.ptr, opts->message.len);`
	`341`	`+ if (opts->message.len > 0) mg_send(c, opts->message.ptr, opts->message.len);`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`void mg_mqtt_sub(struct mg_connection c, const struct mg_mqtt_opts opts) {`