kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-04-28 01:32:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix false null-deref warning in channel_state

Browse Source 
Resolve analyzer warning in channel_state by checking AST_FLAG_DEAD on snapshot, which is guaranteed non-NULL.

Resolves: #1430
This commit is contained in:
phoneben
2025-12-08 00:31:11 +02:00
parent 3fe9377c90
commit d5962bb4dc
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/stasis/app.c
View File

@@ -435,21 +435,25 @@ static struct ast_json *channel_state_change_event(
return simple_channel_event("ChannelStateChange", snapshot, tv);
}
/*! \brief Handle channel state changes */
/*!
*\brief Handle channel state changes
*
*\note For channel snapshot updates, new_snapshot is guaranteed to be
* non-NULL. A channel going away is indicated by AST_FLAG_DEAD
* on the new snapshot. See stasis_channels.h for the invariant.
*/
static struct ast_json *channel_state(
struct ast_channel_snapshot *old_snapshot,
struct ast_channel_snapshot *new_snapshot,
const struct timeval *tv)
{
struct ast_channel_snapshot *snapshot = new_snapshot ?
new_snapshot : old_snapshot;
if (!old_snapshot) {
return channel_created_event(snapshot, tv);
return channel_created_event(new_snapshot, tv);
} else if (ast_test_flag(&new_snapshot->flags, AST_FLAG_DEAD)) {
return channel_destroyed_event(snapshot, tv);
return channel_destroyed_event(new_snapshot, tv);
} else if (old_snapshot->state != new_snapshot->state) {
return channel_state_change_event(snapshot, tv);
return channel_state_change_event(new_snapshot, tv);
}
return NULL;