[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-runtime/KDE/4.11] phonon/kcm: Prevent crash when PulseAudio provides empty name or description
From:       Harald Sitter <sitter () kde ! org>
Date:       2013-10-25 9:49:15
Message-ID: E1VZe15-0007M3-6r () scm ! kde ! org
[Download RAW message or body]

Git commit 9c2d6b45651cd27ea64c2feecac1bdcd2ca2609b by Harald Sitter.
Committed on 25/10/2013 at 09:48.
Pushed by sitter into branch 'KDE/4.11'.

Prevent crash when PulseAudio provides empty name or description

Also construct name from utf8.

BUG: 326601
FIXED-IN: 4.11.3

M  +2    -1    phonon/kcm/audiosetup.cpp

http://commits.kde.org/kde-runtime/9c2d6b45651cd27ea64c2feecac1bdcd2ca2609b

diff --git a/phonon/kcm/audiosetup.cpp b/phonon/kcm/audiosetup.cpp
index ff8d4c8..150230e 100644
--- a/phonon/kcm/audiosetup.cpp
+++ b/phonon/kcm/audiosetup.cpp
@@ -380,7 +380,8 @@ void AudioSetup::updateCard(const pa_card_info *pInfo)
     for (quint32 i = 0; i < pInfo->n_profiles; ++i) {
         const pa_card_profile_info *profile = &(pInfo->profiles[i]);
         const quint32 priority = profile->priority;
-        const QPair<QString, QString> name(profile->name, \
QString::fromUtf8(profile->description)); +        const QPair<QString, QString> \
name(profile->name ? QString::fromUtf8(profile->name) : QString(), +                  \
profile->description ? QString::fromUtf8(profile->description) : QString());  \
info.profiles.insert(priority, name);  }
 


[prev in list] [next in list] [prev in thread] [next in thread]