aboutsummaryrefslogtreecommitdiffstats
path: root/main/freeswitch
diff options
context:
space:
mode:
authorLeonardo Arena <rnalrd@alpinelinux.org>2015-12-05 15:58:30 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2015-12-05 15:58:50 +0000
commite3a800b058adbf5ad1c3afa9f0f41844e180a55b (patch)
tree4cc8e0f7c89fafe68d794c81f62195c5075ba8d6 /main/freeswitch
parente09b5356fd686bd8eae4f0917d1062a7d13b9979 (diff)
downloadaports-e3a800b058adbf5ad1c3afa9f0f41844e180a55b.tar.bz2
aports-e3a800b058adbf5ad1c3afa9f0f41844e180a55b.tar.xz
main/freeswitch: fix crash reported in FS-8612
Diffstat (limited to 'main/freeswitch')
-rw-r--r--main/freeswitch/APKBUILD12
-rw-r--r--main/freeswitch/FS-8612-calls-crash-due-to-read-codec-leak.patch12
2 files changed, 20 insertions, 4 deletions
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 2e565126ed..4c9b2d4a6b 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Cameron Banta <cbanta@gmail.com>
pkgname=freeswitch
pkgver=1.6.2
-pkgrel=2
+pkgrel=3
pkgdesc="A communications platform written in C from the ground up"
url="http://www.freeswitch.org"
arch="all"
@@ -69,6 +69,7 @@ source="http://files.freeswitch.org/freeswitch-releases/$pkgname-$pkgver.tar.xz
modules.conf
freeswitch.confd
freeswitch.initd
+ FS-8612-calls-crash-due-to-read-codec-leak.patch
"
_builddir="$srcdir/$pkgname-$pkgver"
@@ -207,16 +208,19 @@ md5sums="6e7fbf77be0fcccecf12284437e6cbda freeswitch-1.6.2.tar.xz
1e7f335ee00f589825ecc9affa779346 getlib.patch
f99cb4857c5b79fc6646855fe74527c7 modules.conf
c608cca8ad773acebf201f581438c7e7 freeswitch.confd
-3b0bf4847a61afa28229b58763f4c400 freeswitch.initd"
+3b0bf4847a61afa28229b58763f4c400 freeswitch.initd
+078925cba3d5c6b70071acfb591d3fc8 FS-8612-calls-crash-due-to-read-codec-leak.patch"
sha256sums="cf26f491469d2f744fb48ba0a7e25cefd96305e0ef385eda09fca82c096bb48f freeswitch-1.6.2.tar.xz
cc8e509c7aab120eb74a23b2c2a8c64e00497377ea9fc5572559c3361ddfefec 0001-FS-8427-Incompatible-type-for-ld-in-prinrtf.patch
ab437c92149b6fc88bc2fc8a228d6a5f8af574e2c90469a6dc4c753d13972c34 getlib.patch
212f6b4e8463cf2e1266582479f965fd96416c45cda0b016d0becd6e71fec015 modules.conf
846a29a361ef6eecd77876963b5c0133699c40fa8b34c68df42d5f8a1a1915b1 freeswitch.confd
-aa0d89221ffa47eba4a0e085f6041ee198476409dd15d1e90c5c357ba683f432 freeswitch.initd"
+aa0d89221ffa47eba4a0e085f6041ee198476409dd15d1e90c5c357ba683f432 freeswitch.initd
+cf40b3845a35c0de97c71b4fce2a49ad8d08d95a649dda30fcacb28e8a9be872 FS-8612-calls-crash-due-to-read-codec-leak.patch"
sha512sums="b85ebbdc0f4111f76e798b91d23d05b63966fe8ac273bc2581857c1b9b810f970f25fd244ce40884d4939e835c72d7700448ea663a4f2650eb34d67325aa0517 freeswitch-1.6.2.tar.xz
5faaf44f36430ad18769b36e45571320a139e853f6adec2ed0f2c16fffdcd0461a30a674dbae18edc0701a5c1e76f5ddb30962960421db6b103e2f220b9482d0 0001-FS-8427-Incompatible-type-for-ld-in-prinrtf.patch
4ceb48f64d2bc26a02cc0846276506241bfd30c156422b0a1d608fd172c099feb5c121a763652e9a45046dcdd0ba0eb71eab240e0c6ce2ad63ff781719e135a4 getlib.patch
e5027d504c63a2f51419c8b071f4a7d3499177cf2bfd8782e039137475e20910cf3f654848e2d86ecdbcba147592ebdc988ee9083272d7c88f60322bcefa7a6a modules.conf
a585f6411185a26206137a1ad97a06fd6c73e80c5439e9be45eabfa70e7a83120169ba882971fcd328436c8e0242cbd664170b80754ea2846021689baf1f1595 freeswitch.confd
-643d0a2e43f5d3bf3b99fcb6f6422302cb4b74a95eccf844eafb100b15aa9856b4ff41f112d6637255c2e9e2bec9fedc9a9215dfff214dfb83b52eae16b71dca freeswitch.initd"
+643d0a2e43f5d3bf3b99fcb6f6422302cb4b74a95eccf844eafb100b15aa9856b4ff41f112d6637255c2e9e2bec9fedc9a9215dfff214dfb83b52eae16b71dca freeswitch.initd
+f951a6e065f638d3259f4897702dcf240d84a7b1204a0e7f51d60ab625e8eed74421c58bc58f08e1cd72db339e8166726545a6001a18e6cd56d54e4d57d2f46d FS-8612-calls-crash-due-to-read-codec-leak.patch"
diff --git a/main/freeswitch/FS-8612-calls-crash-due-to-read-codec-leak.patch b/main/freeswitch/FS-8612-calls-crash-due-to-read-codec-leak.patch
new file mode 100644
index 0000000000..56abe1ce10
--- /dev/null
+++ b/main/freeswitch/FS-8612-calls-crash-due-to-read-codec-leak.patch
@@ -0,0 +1,12 @@
+diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
+index c65b80b..6b03c17 100644
+--- a/src/switch_ivr_originate.c
++++ b/src/switch_ivr_originate.c
+@@ -1863,6 +1863,7 @@ static void *SWITCH_THREAD_FUNC early_thread_run(switch_thread_t *thread, void *
+ if (!session) continue;
+
+ if (switch_core_codec_ready((&read_codecs[i]))) {
++ switch_core_session_set_read_codec(session, NULL);
+ switch_core_codec_destroy(&read_codecs[i]);
+ }
+