kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #462 from dragos-oancea/mod_amqp-nullptrs 

[mod_amqp] scan-build: Multiple dereference of null pointer (loaded from variable 'active')
This commit is contained in:
Andrey Volk 2020-03-06 00:52:54 +04:00 committed by GitHub
parent c66c314f57 746d5c3919
commit bd3982d607
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mod/event_handlers/mod_amqp/mod_amqp_connection.c
View File

@ -150,20 +150,26 @@ switch_status_t mod_amqp_connection_open(mod_amqp_connection_t *connections, mod
connection_attempt->password); connection_attempt->password);
if (mod_amqp_log_if_amqp_error(status, "Logging in")) { if (mod_amqp_log_if_amqp_error(status, "Logging in")) {
mod_amqp_connection_close(*active); if (active) {
*active = NULL; mod_amqp_connection_close(*active);
*active = NULL;
}
goto err; goto err;
} }
// Open a channel (1). This is fairly standard // Open a channel (1). This is fairly standard
amqp_channel_open(newConnection, 1); amqp_channel_open(newConnection, 1);
if (mod_amqp_log_if_amqp_error(amqp_get_rpc_reply(newConnection), "Opening channel")) { if (mod_amqp_log_if_amqp_error(amqp_get_rpc_reply(newConnection), "Opening channel")) {
mod_amqp_connection_close(*active); if (active) {
*active = NULL; mod_amqp_connection_close(*active);
*active = NULL;
}
goto err; goto err;
} }
(*active)->state = newConnection; if (active) {
(*active)->state = newConnection;
}
if (oldConnection) { if (oldConnection) {
amqp_destroy_connection(oldConnection); amqp_destroy_connection(oldConnection);