slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check and fix up bounds in QMediaPlaylist methods.

Browse Source 
Change-Id: I665d665139dbe9663b20ecb08fa3dab9cbe3f899
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
This commit is contained in:
Loïc Molinari
2015-08-09 21:35:07 +02:00
committed by Yoann Lopes
parent 414b748b23
commit 475a14ccc3
2 changed files with 133 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/multimedia/playback/qmediaplaylist.cpp
View File

@@ -358,7 +358,8 @@ bool QMediaPlaylist::addMedia(const QList<QMediaContent> &items)
bool QMediaPlaylist::insertMedia(int pos, const QMediaContent &content)
{
return d_func()->playlist()->insertMedia(pos, content);
QMediaPlaylistProvider *playlist = d_func()->playlist();
return playlist->insertMedia(qBound(0, pos, playlist->mediaCount()), content);
}
/*!
@@ -369,7 +370,8 @@ bool QMediaPlaylist::insertMedia(int pos, const QMediaContent &content)
bool QMediaPlaylist::insertMedia(int pos, const QList<QMediaContent> &items)
{
return d_func()->playlist()->insertMedia(pos, items);
QMediaPlaylistProvider *playlist = d_func()->playlist();
return playlist->insertMedia(qBound(0, pos, playlist->mediaCount()), items);
}
/*!
@@ -379,8 +381,11 @@ bool QMediaPlaylist::insertMedia(int pos, const QList<QMediaContent> &items)
*/
bool QMediaPlaylist::removeMedia(int pos)
{
Q_D(QMediaPlaylist);
return d->playlist()->removeMedia(pos);
QMediaPlaylistProvider *playlist = d_func()->playlist();
if (pos >= 0 && pos < playlist->mediaCount())
return playlist->removeMedia(pos);
else
return false;
}
/*!
@@ -390,8 +395,13 @@ bool QMediaPlaylist::removeMedia(int pos)
*/
bool QMediaPlaylist::removeMedia(int start, int end)
{
Q_D(QMediaPlaylist);
return d->playlist()->removeMedia(start, end);
QMediaPlaylistProvider *playlist = d_func()->playlist();
start = qMax(0, start);
end = qMin(end, playlist->mediaCount() - 1);
if (start <= end)
return playlist->removeMedia(start, end);
else
return false;
}
/*!