Skip to content

Commit

Permalink
Merge pull request #822 from micmac1/ast-iax2-crash
Browse files Browse the repository at this point in the history
asterisk: add upstream patch against iax2 crash
  • Loading branch information
micmac1 authored Jul 23, 2023
2 parents 6e1c2e9 + 3d063ac commit c093d20
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion net/asterisk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=asterisk
PKG_VERSION:=20.3.0
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://downloads.asterisk.org/pub/telephony/asterisk/releases
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From d26a00ef3484f7fa602044e73e31bcefc8ca1917 Mon Sep 17 00:00:00 2001
From: Sean Bright <[email protected]>
Date: Fri, 7 Jul 2023 15:57:39 -0400
Subject: [PATCH] chan_iax2.c: Avoid crash with IAX2 switch support.

A change made in 82cebaa0 did not properly handle the case when a
channel was not provided, triggering a crash. ast_check_hangup(...)
does not protect against NULL pointers.

Fixes #180
---
channels/chan_iax2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -14323,7 +14323,7 @@ static struct iax2_dpcache *find_cache(s
ast_log(LOG_WARNING, "Timeout waiting for %s exten %s\n", data, exten);
}

- if (ast_check_hangup(chan)) {
+ if (chan && ast_check_hangup(chan)) {
doabort = 1;
}

0 comments on commit c093d20

Please sign in to comment.