kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

VECTOR: Passing parameters with side effects to macros is dangerous.

Browse Source 
* Fix several instances where we were bumping a ref in the parameter and
then unrefing the object if it failed.  The way the AST_VECTOR_APPEND()
and AST_VECTOR_REPLACE() macros are implemented means if it fails the new
value was never evaluated.

Change-Id: I2847872a455b11ea7e5b7ce697c0a455a1d0ac9a
This commit is contained in:
Richard Mudgett
2018-06-21 16:39:45 -05:00
parent d87631d21f
commit cad50d6dbf
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bridges/bridge_softmix.c
View File

@@ -2085,7 +2085,9 @@ static void remb_enable_collection(struct ast_bridge *bridge, struct ast_bridge_
}
}
if (AST_VECTOR_REPLACE(&softmix_data->remb_collectors, bridge_stream_position, ao2_bump(sc->remb_collector))) {
ao2_ref(sc->remb_collector, +1);
if (AST_VECTOR_REPLACE(&softmix_data->remb_collectors, bridge_stream_position,
sc->remb_collector)) {
ao2_ref(sc->remb_collector, -1);
}
}