diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-11-03 08:23:18 +1000 |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-11-03 08:23:18 +1000 |
| commit | b72d41cf30f82c74c10c31808907cc990c86efe6 (patch) | |
| tree | 502ec3abe99a1efaa3c91f1c81bf67104198ccc1 /src/openvg/qpixmapfilter_vg.cpp | |
| parent | c7386b14e0c9844db91ca0d2ae6bded6efa008aa (diff) | |
Protect the OpenVG engine from null QPixmapData objects
Reviewed-by: Sarah Smith
Diffstat (limited to 'src/openvg/qpixmapfilter_vg.cpp')
| -rw-r--r-- | src/openvg/qpixmapfilter_vg.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/openvg/qpixmapfilter_vg.cpp b/src/openvg/qpixmapfilter_vg.cpp index 8e104db223..e17c7285ca 100644 --- a/src/openvg/qpixmapfilter_vg.cpp +++ b/src/openvg/qpixmapfilter_vg.cpp @@ -65,6 +65,9 @@ void QVGPixmapConvolutionFilter::draw (QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect) const { + if (src.isNull()) + return; + if (src.pixmapData()->classId() != QPixmapData::OpenVGClass) { // The pixmap data is not an instance of QVGPixmapData, so fall // back to the default convolution filter implementation. @@ -135,6 +138,9 @@ QVGPixmapColorizeFilter::~QVGPixmapColorizeFilter() void QVGPixmapColorizeFilter::draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect) const { + if (src.isNull()) + return; + if (src.pixmapData()->classId() != QPixmapData::OpenVGClass) { // The pixmap data is not an instance of QVGPixmapData, so fall // back to the default colorize filter implementation. @@ -225,6 +231,9 @@ QVGPixmapDropShadowFilter::~QVGPixmapDropShadowFilter() void QVGPixmapDropShadowFilter::draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect) const { + if (src.isNull()) + return; + if (src.pixmapData()->classId() != QPixmapData::OpenVGClass) { // The pixmap data is not an instance of QVGPixmapData, so fall // back to the default drop shadow filter implementation. @@ -290,6 +299,9 @@ QVGPixmapBlurFilter::~QVGPixmapBlurFilter() void QVGPixmapBlurFilter::draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect) const { + if (src.isNull()) + return; + if (src.pixmapData()->classId() != QPixmapData::OpenVGClass) { // The pixmap data is not an instance of QVGPixmapData, so fall // back to the default blur filter implementation. |