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

List:       kde-commits
Subject:    branches/KDE/3.5/kdemultimedia/kioslave/audiocd/plugins/lame
From:       Adriaan de Groot <groot () kde ! org>
Date:       2006-01-05 22:45:42
Message-ID: 1136501142.798322.13211.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 494651 by adridg:

If proc.collectedStdout() is empty, fromLocal8Bit calls strlen on a NULL pointer in \
Qt 3.3 which may crash. Instead, to the checking here and only convert a non-empty \
buffer. Patch thanks to Markus Brueffer and Frerich Raabe.

CCMAIL: kde@freebsd.org


 M  +5 -1      encoderlame.cpp  


--- branches/KDE/3.5/kdemultimedia/kioslave/audiocd/plugins/lame/encoderlame.cpp \
#494650:494651 @@ -90,7 +90,11 @@
 	if(proc.exitStatus() != 0)
 		return false;
 
-	QString str = QString::fromLocal8Bit( proc.collectedStdout() );
+	const QByteArray data = proc.collectedStdout();
+	QString str;
+	if ( !data.isEmpty() )
+		str = QString::fromLocal8Bit( data, data.size() );
+
 	d->genreList = QStringList::split( '\n', str );
 	// Remove the numbers in front of every genre
 	for( QStringList::Iterator it = d->genreList.begin(); it != d->genreList.end(); \
++it ) {


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