03/03: gnu: jami: Apply a patch to fix a crash when using SIP.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit a4d52f07d7fd0e4d9997b3021192685d4a3b0b71
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Dec 4 00:54:55 2022 -0500

    gnu: jami: Apply a patch to fix a crash when using SIP.
    
    * gnu/packages/patches/jami-sipaccount-segfault.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/jami.scm (%jami-sources): Apply it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/jami.scm                              |  1 +
 .../patches/jami-sipaccount-segfault.patch         | 30 ++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/gnu/local.mk b/gnu/local.mk
index 1bfbe28bde..1602225330 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1345,6 +1345,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/jami-fix-unit-tests-build.patch          \
   %D%/packages/patches/jami-libjami-headers-search.patch       \
   %D%/packages/patches/jami-no-webengine.patch                 \
+  %D%/packages/patches/jami-sipaccount-segfault.patch          \
   %D%/packages/patches/jami-sip-contacts.patch                 \
   %D%/packages/patches/jami-sip-unregister.patch               \
   %D%/packages/patches/jami-xcb-link.patch                     \
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 45618beb9b..3bdcabdc17 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -99,6 +99,7 @@
                              "jami-fix-unit-tests-build.patch"
                              "jami-fix-qml-imports.patch"
                              "jami-no-webengine.patch"
+                             "jami-sipaccount-segfault.patch"
                              "jami-sip-contacts.patch"
                              "jami-sip-unregister.patch"
                              "jami-xcb-link.patch"))))
diff --git a/gnu/packages/patches/jami-sipaccount-segfault.patch 
b/gnu/packages/patches/jami-sipaccount-segfault.patch
new file mode 100644
index 0000000000..1cef512124
--- /dev/null
+++ b/gnu/packages/patches/jami-sipaccount-segfault.patch
@@ -0,0 +1,30 @@
+From e5a449d60abc667d85dacd75ad6e31d4ddca5853 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
+ <sebastien.blin@savoirfairelinux.com>
+Date: Thu, 17 Nov 2022 12:02:20 -0500
+Subject: [PATCH] sipaccount: fix potential null dereference
+
+Detected by sonarqube
+
+Change-Id: I606f9cf2458dda07471d0a67af8915c7ca13d410
+---
+ src/sip/sipaccount.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/src/sip/sipaccount.cpp b/daemon/src/sip/sipaccount.cpp
+index 695b71839..e544ac31a 100644
+--- a/daemon/src/sip/sipaccount.cpp
++++ b/daemon/src/sip/sipaccount.cpp
+@@ -789,7 +789,8 @@ SIPAccount::sendRegister()
+     if (pjsip_regc_set_transport(regc, &tp_sel) != PJ_SUCCESS)
+         throw VoipLinkException("Unable to set transport");
+ 
+-    setUpTransmissionData(tdata, tp_sel.u.transport->key.type);
++    if (tp_sel.u.transport)
++        setUpTransmissionData(tdata, tp_sel.u.transport->key.type);
+ 
+     // pjsip_regc_send increment the transport ref count by one,
+     if ((status = pjsip_regc_send(regc, tdata)) != PJ_SUCCESS) {
+-- 
+GitLab
+