HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1086:c79a09d1d08f

PieSeries won't crash anymore if mapped columns/rows are not existing

Marek Rosa -

r1086:c79a09d1d08f

parent child

Context file:

r1086:c79a09d1d08f

src/piechart/qpieseries.cpp +7 -1

                 q->clear();
                 // create the initial slices set
                 if (m_mapOrientation == Qt::Vertical) {
+                    if (m_mapValues >= m_model->columnCount() || m_mapLabels >= m_model->columnCount())
+                        return;   // mapped columns are not existing
                     int sliceCount = 0;
                     if(m_mapCount == -1)
                         sliceCount = m_model->rowCount() - m_mapFirst;
                     for (int i = m_mapFirst; i < m_mapFirst + sliceCount; i++)
                         q->append(m_model->data(m_model->index(i, m_mapValues), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(i, m_mapLabels), Qt::DisplayRole).toString());
                 } else {
+                    if (m_mapValues >= m_model->rowCount() || m_mapLabels >= m_model->rowCount())
+                        return;   // mapped columns are not existing
                     int sliceCount = 0;
                     if(m_mapCount == -1)
                         sliceCount = m_model->columnCount() - m_mapFirst;

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages