nicolabs/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-05-21 12:24:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix mutex being incorrectly passed by value. Fixes bug #1373785.

Browse source
This commit is contained in:
Roger A. Light 2014-10-05 21:56:44 +01:00
parent 4a19d9ae3a
commit 1e87697359
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog.txt
View file

@ -5,6 +5,9 @@ Broker:
- Fix possible memory leak when using a topic that has a leading slash. Fixes
bug #1360985.
Client library:
- Fix mutex being incorrectly passed by value. Fixes bug #1373785.
1.3.4 - 20140806
================

10
lib/messages_mosq.c
View file

@ -297,7 +297,7 @@ int _mosquitto_message_remove(struct mosquitto *mosq, uint16_t mid, enum mosquit
}
#ifdef WITH_THREADING
void _mosquitto_message_retry_check_actual(struct mosquitto *mosq, struct mosquitto_message_all *messages, pthread_mutex_t mutex)
void _mosquitto_message_retry_check_actual(struct mosquitto *mosq, struct mosquitto_message_all *messages, pthread_mutex_t *mutex)
#else
void _mosquitto_message_retry_check_actual(struct mosquitto *mosq, struct mosquitto_message_all *messages)
#endif
@ -306,7 +306,7 @@ void _mosquitto_message_retry_check_actual(struct mosquitto *mosq, struct mosqui
assert(mosq);
#ifdef WITH_THREADING
pthread_mutex_lock(&mutex);
pthread_mutex_lock(mutex);
#endif
while(messages){
@ -335,15 +335,15 @@ void _mosquitto_message_retry_check_actual(struct mosquitto *mosq, struct mosqui
messages = messages->next;
}
#ifdef WITH_THREADING
pthread_mutex_unlock(&mutex);
pthread_mutex_unlock(mutex);
#endif
}
void _mosquitto_message_retry_check(struct mosquitto *mosq)
{
#ifdef WITH_THREADING
_mosquitto_message_retry_check_actual(mosq, mosq->out_messages, mosq->out_message_mutex);
_mosquitto_message_retry_check_actual(mosq, mosq->in_messages, mosq->in_message_mutex);
_mosquitto_message_retry_check_actual(mosq, mosq->out_messages, &mosq->out_message_mutex);
_mosquitto_message_retry_check_actual(mosq, mosq->in_messages, &mosq->in_message_mutex);
#else
_mosquitto_message_retry_check_actual(mosq, mosq->out_messages);
_mosquitto_message_retry_check_actual(mosq, mosq->in_messages);