d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More "client has disconnected but is not freed" protections.

Browse Source
This commit is contained in:
Roger A. Light 2014-10-17 00:08:10 +01:00
parent c8dffcbfbb
commit 372b64a290
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/database.c
View File

@ -214,6 +214,7 @@ int mqtt3_db_message_insert(struct mosquitto_db *db, struct mosquitto *context,
assert(stored); assert(stored);
if(!context) return MOSQ_ERR_INVAL; if(!context) return MOSQ_ERR_INVAL;
if(!context->id) return MOSQ_ERR_SUCCESS; /* Protect against unlikely "client is disconnected but not entirely freed" scenario */
/* Check whether we've already sent this message to this client /* Check whether we've already sent this message to this client
* for outgoing messages only. * for outgoing messages only.

12
src/loop.c
View File

@ -385,6 +385,10 @@ static void loop_handle_errors(struct mosquitto_db *db, struct pollfd *pollfds)
struct mosquitto *context, *ctxt_tmp; struct mosquitto *context, *ctxt_tmp;
HASH_ITER(hh_sock, db->contexts_by_sock, context, ctxt_tmp){ HASH_ITER(hh_sock, db->contexts_by_sock, context, ctxt_tmp){
if(context->pollfd_index < 0){
continue;
}
if(pollfds[context->pollfd_index].revents & (POLLERR | POLLNVAL)){ if(pollfds[context->pollfd_index].revents & (POLLERR | POLLNVAL)){
do_disconnect(db, context); do_disconnect(db, context);
} }
@ -396,6 +400,10 @@ static void loop_handle_reads_writes(struct mosquitto_db *db, struct pollfd *pol
struct mosquitto *context, *ctxt_tmp; struct mosquitto *context, *ctxt_tmp;
HASH_ITER(hh_sock, db->contexts_by_sock, context, ctxt_tmp){ HASH_ITER(hh_sock, db->contexts_by_sock, context, ctxt_tmp){
if(context->pollfd_index < 0){
continue;
}
assert(pollfds[context->pollfd_index].fd == context->sock); assert(pollfds[context->pollfd_index].fd == context->sock);
#ifdef WITH_TLS #ifdef WITH_TLS
if(pollfds[context->pollfd_index].revents & POLLOUT || if(pollfds[context->pollfd_index].revents & POLLOUT ||
@ -412,6 +420,10 @@ static void loop_handle_reads_writes(struct mosquitto_db *db, struct pollfd *pol
} }
HASH_ITER(hh_sock, db->contexts_by_sock, context, ctxt_tmp){ HASH_ITER(hh_sock, db->contexts_by_sock, context, ctxt_tmp){
if(context->pollfd_index < 0){
continue;
}
#ifdef WITH_TLS #ifdef WITH_TLS
if(pollfds[context->pollfd_index].revents & POLLIN || if(pollfds[context->pollfd_index].revents & POLLIN ||
(context->ssl && context->state == mosq_cs_new)){ (context->ssl && context->state == mosq_cs_new)){