From 8b09cd89de06759d642e69bd0751f707c0ef3da3 Mon Sep 17 00:00:00 2001
From: Olivier Dion <olivier.dion@savoirfairelinux.com>
Date: Mon, 28 Jun 2021 13:44:45 -0400
Subject: [PATCH] account: Fix read after free

Commit f0fb8148ba7f453d73e31e1cece2dcffae68e878 introduces a bug that makes Jami
crash with ASAN.

Change-Id: I7547fcc221b8bf25fdb0b2ae5a9a6f458eceda88
---
 src/account.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/account.cpp b/src/account.cpp
index fe9bde34f9..cfb2bd62bb 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -96,10 +96,9 @@ const char* const Account::LOCAL_MODERATORS_ENABLED_KEY = "localModeratorsEnable
 const char* const Account::ALL_MODERATORS_ENABLED_KEY = "allModeratorsEnabled";
 
 #ifdef __ANDROID__
-const char* const DEFAULT_RINGTONE_PATH = "/data/data/cx.ring/files/ringtones/default.opus";
+constexpr const char* const DEFAULT_RINGTONE_PATH = "/data/data/cx.ring/files/ringtones/default.opus";
 #else
-const char* const DEFAULT_RINGTONE_PATH = (std::string() + PROGSHAREDIR + "/ringtones/default.opus")
-                                              .c_str();
+constexpr const char* const DEFAULT_RINGTONE_PATH =  PROGSHAREDIR "/ringtones/default.opus";
 #endif
 
 Account::Account(const std::string& accountID)
-- 
GitLab