GIT_SILENT Upgrade ECM and KF5 version requirements for 5.62.0 release.

Fix uninitialized memory read
Summary: Make sure whole of pixel_size in pixel has data either because it was read or because we set it to 0 oss-fuzz/14565 Reviewers: dfaure, apol, vkrause Reviewed By: vkrause Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D23739
2025-07-15 11:14:18 -04:00 · 2019-09-07 12:35:26 +00:00 · 2019-09-05 20:05:35 +02:00 · 2019-08-03 19:33:24 +00:00 · 2019-08-02 22:54:45 +02:00 · 2019-07-20 11:29:31 +02:00
40 changed files with 498 additions and 253 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,21 @@
+# Ignore the following files
+*~
+*.[oa]
+*.diff
+*.kate-swp
+*.kdev4
+.kdev_include_paths
+*.kdevelop.pcs
+*.moc
+*.moc.cpp
+*.orig
+*.user
+.*.swp
+.swp.*
+Doxyfile
+Makefile
+avail
+random_seed
+/build*/
+CMakeLists.txt.user*
+*.unc-backup*
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,14 +1,14 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)

 project(KImageFormats)

 include(FeatureSummary)
-find_package(ECM 5.43.0  NO_MODULE)
+find_package(ECM 5.62.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)


-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})

 include(KDEInstallDirs)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
@ -17,7 +17,7 @@ include(KDECMakeSettings)

 include(CheckIncludeFiles)

-set(REQUIRED_QT_VERSION 5.7.0)
+set(REQUIRED_QT_VERSION 5.11.0)
 find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)

 find_package(KF5Archive)
@ -45,7 +45,7 @@ set_package_properties(OpenEXR PROPERTIES
    TYPE OPTIONAL
    PURPOSE "Required for the QImage plugin for OpenEXR images"
 )
-
+add_definitions(-DQT_NO_FOREACH)
 add_subdirectory(src)
 if (BUILD_TESTING)
    add_subdirectory(autotests)
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@ -3,7 +3,7 @@
 include(ECMMarkAsTest)
 include(CMakeParseArguments)

-add_definitions(-DPLUGIN_DIR="${CMAKE_CURRENT_BINARY_DIR}/../src")
+add_definitions(-DPLUGIN_DIR="${CMAKE_CURRENT_BINARY_DIR}/../bin")
 remove_definitions(-DQT_NO_CAST_FROM_ASCII)

 macro(kimageformats_read_tests)
--- a/autotests/pictest.cpp
+++ b/autotests/pictest.cpp
@ -210,11 +210,11 @@ private Q_SLOTS:
            QFile picDumpFile(fileNameBase + QStringLiteral("-expected.data"));
            QVERIFY2(picDumpFile.open(QIODevice::WriteOnly), qPrintable(picDumpFile.errorString()));
            picDumpFile.write(reinterpret_cast<const char *>(inputImage.bits()),
-                              inputImage.byteCount());
+                              inputImage.sizeInBytes());
            QFile pngDumpFile(fileNameBase + QStringLiteral("-actual.data"));
            QVERIFY2(pngDumpFile.open(QIODevice::WriteOnly), qPrintable(pngDumpFile.errorString()));
            pngDumpFile.write(reinterpret_cast<const char *>(expImage.bits()),
-                              expImage.byteCount());
+                              expImage.sizeInBytes());
            QString msg = QStringLiteral("Read image (")
                        + picDumpFile.fileName()
                        + QStringLiteral(") differed from expected image (")
--- a/autotests/read/xcf/simple-rgba-gimp-2.8.10.png
+++ b/autotests/read/xcf/simple-rgba-gimp-2.8.10.png
--- a/autotests/readtest.cpp
+++ b/autotests/readtest.cpp
@ -35,8 +35,8 @@ static void writeImageData(const char *name, const QString &filename, const QIma
 {
    QFile file(filename);
    if (file.open(QIODevice::WriteOnly)) {
-        qint64 written = file.write(reinterpret_cast<const char *>(image.bits()), image.byteCount());
-        if (written == image.byteCount()) {
+        qint64 written = file.write(reinterpret_cast<const char *>(image.bits()), image.sizeInBytes());
+        if (written == image.sizeInBytes()) {
            QTextStream(stdout) << "       " << name
                                << " written to " << filename << "\n";
        } else {
@ -75,6 +75,7 @@ static bool fuzzyeq(const QImage &im1, const QImage &im2, uchar fuzziness)
 int main(int argc, char ** argv)
 {
    QCoreApplication app(argc, argv);
+    QCoreApplication::removeLibraryPath(QStringLiteral(PLUGIN_DIR));
    QCoreApplication::addLibraryPath(QStringLiteral(PLUGIN_DIR));
    QCoreApplication::setApplicationName(QStringLiteral("readtest"));
    QCoreApplication::setApplicationVersion(QStringLiteral("1.0.0"));
@ -126,7 +127,8 @@ int main(int argc, char ** argv)
        << "Starting basic read tests for "
        << suffix << " images *********\n";

-    foreach (QFileInfo fi, imgdir.entryInfoList()) {
+    const QFileInfoList lstImgDir = imgdir.entryInfoList();
+    for (const QFileInfo &fi : lstImgDir) {
        int suffixPos = fi.filePath().count() - suffix.count();
        QString inputfile = fi.filePath();
        QString expfile = fi.filePath().replace(suffixPos, suffix.count(), QStringLiteral("png"));
@ -146,6 +148,14 @@ int main(int argc, char ** argv)
            ++failed;
            continue;
        }
+        if (!inputReader.canRead()) {
+            QTextStream(stdout) << "FAIL : " << fi.fileName()
+                << ": failed can read: "
+                << inputReader.errorString()
+                << "\n";
+            ++failed;
+            continue;
+        }
        if (!inputReader.read(&inputImage)) {
            QTextStream(stdout) << "FAIL : " << fi.fileName()
                << ": failed to load: "
--- a/autotests/writetest.cpp
+++ b/autotests/writetest.cpp
@ -34,6 +34,7 @@
 int main(int argc, char ** argv)
 {
    QCoreApplication app(argc, argv);
+    QCoreApplication::removeLibraryPath(QStringLiteral(PLUGIN_DIR));
    QCoreApplication::addLibraryPath(QStringLiteral(PLUGIN_DIR));
    QCoreApplication::setApplicationName(QStringLiteral("readtest"));
    QCoreApplication::setApplicationVersion(QStringLiteral("1.0.0"));
@ -72,8 +73,8 @@ int main(int argc, char ** argv)
    QTextStream(stdout) << "********* "
        << "Starting basic write tests for "
        << suffix << " images *********\n";
-
-    foreach (QFileInfo fi, imgdir.entryInfoList()) {
+    const QFileInfoList lstImgDir = imgdir.entryInfoList();
+    for (const QFileInfo &fi : lstImgDir) {
        int suffixPos = fi.filePath().count() - suffix.count();
        QString pngfile = fi.filePath().replace(suffixPos, suffix.count(), QStringLiteral("png"));
        QString pngfilename = QFileInfo(pngfile).fileName();
--- a/src/imageformats/CMakeLists.txt
+++ b/src/imageformats/CMakeLists.txt
@ -15,7 +15,6 @@ function(kimageformats_add_plugin plugin)
        message(FATAL_ERROR "JSON file doesn't exist: ${json}")
    endif()

-    set_property(SOURCE ${KIF_ADD_PLUGIN_SOURCES} APPEND PROPERTY OBJECT_DEPENDS ${json})
    add_library(${plugin} MODULE ${KIF_ADD_PLUGIN_SOURCES})
    set_property(TARGET ${plugin} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${json})
    set_target_properties(${plugin} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/imageformats")
--- a/src/imageformats/eps.cpp
+++ b/src/imageformats/eps.cpp
@ -14,6 +14,7 @@
 #include <QPrinter>
 #include <QProcess>
 #include <QTemporaryFile>
+#include <QCoreApplication>

 // logging category for this framework, default: log stuff >= warning
 Q_LOGGING_CATEGORY(EPSPLUGIN, "epsplugin", QtWarningMsg)
@ -156,7 +157,7 @@ bool EPSHandler::read(QImage *image)

    QTemporaryFile tmpFile;
    if (!tmpFile.open()) {
-        qWarning() << "Could not create the temporary file" << tmpFile.fileName();
+        qCWarning(EPSPLUGIN) << "Could not create the temporary file" << tmpFile.fileName();
        return false;
    }
    qCDebug(EPSPLUGIN) << "temporary file:" << tmpFile.fileName();
@ -198,7 +199,7 @@ bool EPSHandler::read(QImage *image)
    converter.setProcessChannelMode(QProcess::ForwardedErrorChannel);
    converter.start(QStringLiteral("gs"), gsArgs);
    if (!converter.waitForStarted(3000)) {
-        qWarning() << "Reading EPS files requires gs (from GhostScript)";
+        qCWarning(EPSPLUGIN) << "Reading EPS files requires gs (from GhostScript)";
        return false;
    }

@ -297,7 +298,7 @@ bool EPSHandler::write(const QImage &image)
        converter.start(QStringLiteral("gs"), gsArgs);

        if (!converter.waitForStarted(3000)) {
-            qWarning() << "Creating EPS files requires pdftops (from Poppler) or gs (from GhostScript)";
+            qCWarning(EPSPLUGIN) << "Creating EPS files requires pdftops (from Poppler) or gs (from GhostScript)";
            return false;
        }
    }
@ -312,7 +313,7 @@ bool EPSHandler::write(const QImage &image)
 bool EPSHandler::canRead(QIODevice *device)
 {
    if (!device) {
-        qWarning("EPSHandler::canRead() called with no device");
+        qCWarning(EPSPLUGIN) << "EPSHandler::canRead() called with no device";
        return false;
    }

@ -333,6 +334,15 @@ bool EPSHandler::canRead(QIODevice *device)

 QImageIOPlugin::Capabilities EPSPlugin::capabilities(QIODevice *device, const QByteArray &format) const
 {
+    // prevent bug #397040: when on app shutdown the clipboard content is to be copied to survive end of the app,
+    // QXcbIntegration looks for some QImageIOHandler to apply, querying the capabilities and picking any first.
+    // At that point this plugin no longer has its requirements e.g. to run the external process, so we have to deny.
+    // The capabilities seem to be queried on demand in Qt code and not cached, so it's fine to report based
+    // in current dynamic state
+    if (!QCoreApplication::instance()) {
+        return {};
+    }
+
    if (format == "eps" || format == "epsi" || format == "epsf") {
        return Capabilities(CanRead | CanWrite);
    }
--- a/src/imageformats/eps_p.h
+++ b/src/imageformats/eps_p.h
@ -4,8 +4,8 @@
 *
 * This library is distributed under the conditions of the GNU LGPL.
 */
-#ifndef KIMG_EPS_H
-#define KIMG_EPS_H
+#ifndef KIMG_EPS_P_H
+#define KIMG_EPS_P_H

 #include <QImageIOPlugin>
 #include <QLoggingCategory>
@ -15,9 +15,9 @@ class EPSHandler : public QImageIOHandler
 public:
    EPSHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;

    static bool canRead(QIODevice *device);
 };
@ -28,11 +28,11 @@ class EPSPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "eps.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

 Q_DECLARE_LOGGING_CATEGORY(EPSPLUGIN)

-#endif // KIMG_EPS_H
+#endif // KIMG_EPS_P_H

--- a/src/imageformats/exr.cpp
+++ b/src/imageformats/exr.cpp
@ -30,7 +30,7 @@

 #include <QImage>
 #include <QDataStream>
-// #include <QDebug>
+#include <QDebug>
 #include <QImageIOPlugin>

 class K_IStream: public Imf::IStream
@ -41,10 +41,10 @@ public:
    {
    }

-    bool  read(char c[], int n) Q_DECL_OVERRIDE;
-    Imf::Int64 tellg() Q_DECL_OVERRIDE;
-    void seekg(Imf::Int64 pos) Q_DECL_OVERRIDE;
-    void clear() Q_DECL_OVERRIDE;
+    bool  read(char c[], int n) override;
+    Imf::Int64 tellg() override;
+    void seekg(Imf::Int64 pos) override;
+    void clear() override;

 private:
    QIODevice *m_dev;
@ -82,7 +82,7 @@ void K_IStream::clear()
 * format into the normal 32 bit pixel format. Process is from the
 * ILM code.
 */
-QRgb RgbaToQrgba(struct Imf::Rgba imagePixel)
+QRgb RgbaToQrgba(struct Imf::Rgba &imagePixel)
 {
    float r, g, b, a;

--- a/src/imageformats/exr_p.h
+++ b/src/imageformats/exr_p.h
@ -8,8 +8,8 @@
 *
 */

-#ifndef KIMG_EXR_H
-#define KIMG_EXR_H
+#ifndef KIMG_EXR_P_H
+#define KIMG_EXR_P_H

 #include <QImageIOPlugin>

@ -18,8 +18,8 @@ class EXRHandler : public QImageIOHandler
 public:
    EXRHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *outImage) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *outImage) override;

    static bool canRead(QIODevice *device);
 };
@ -30,8 +30,8 @@ class EXRPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "exr.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

-#endif // KIMG_EXR_H
+#endif // KIMG_EXR_P_H
--- a/src/imageformats/gimp_p.h
+++ b/src/imageformats/gimp_p.h
@ -125,7 +125,8 @@ typedef enum {
    PROP_PARASITES = 21,
    PROP_UNIT = 22,
    PROP_PATHS = 23,
-    PROP_USER_UNIT = 24
+    PROP_USER_UNIT = 24,
+    MAX_SUPPORTED_PROPTYPE // should always be at the end so its value is last + 1
 } PropType;

 // From GIMP "xcf.c" v1.2
--- a/src/imageformats/hdr.cpp
+++ b/src/imageformats/hdr.cpp
@ -11,7 +11,7 @@
 #include "hdr_p.h"

 #include <QImage>
-#include <QtCore/QDataStream>
+#include <QDataStream>

 #include <QDebug>

--- a/src/imageformats/hdr_p.h
+++ b/src/imageformats/hdr_p.h
@ -7,8 +7,8 @@
   version 2 of the License, or (at your option) any later version.
 */

-#ifndef KIMG_HDR_H
-#define KIMG_HDR_H
+#ifndef KIMG_HDR_P_H
+#define KIMG_HDR_P_H

 class QImageIO;

--- a/src/imageformats/kra.cpp
+++ b/src/imageformats/kra.cpp
@ -18,6 +18,9 @@
 #include <QIODevice>
 #include <QFile>

+static constexpr char s_magic[] = "application/x-krita";
+static constexpr int s_magic_size = sizeof(s_magic) - 1; // -1 to remove the last \0
+
 KraHandler::KraHandler()
 {
 }
@ -36,7 +39,7 @@ bool KraHandler::read(QImage *image)
    KZip zip(device());
    if (!zip.open(QIODevice::ReadOnly)) return false;

-    const KArchiveEntry *entry = zip.directory()->entry(QLatin1String("mergedimage.png"));
+    const KArchiveEntry *entry = zip.directory()->entry(QStringLiteral("mergedimage.png"));
    if (!entry || !entry->isFile()) return false;

    const KZipFileEntry* fileZipEntry = static_cast<const KZipFileEntry*>(entry);
@ -55,7 +58,7 @@ bool KraHandler::canRead(QIODevice *device)

    char buff[57];
    if (device->peek(buff, sizeof(buff)) == sizeof(buff))
-        return qstrcmp(buff + 0x26, "application/x-krita") == 0;
+        return memcmp(buff + 0x26, s_magic, s_magic_size) == 0;

    return false;
 }
--- a/src/imageformats/kra.h
+++ b/src/imageformats/kra.h
@ -17,8 +17,8 @@ class KraHandler : public QImageIOHandler
 public:
    KraHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image)  Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image)  override;

    static bool canRead(QIODevice *device);
 };
@ -29,8 +29,8 @@ class KraPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "kra.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };


--- a/src/imageformats/kra.json
+++ b/src/imageformats/kra.json
@ -1,5 +1,4 @@
 {
    "Keys": [ "kra" ],
-    "MimeTypes": [ "application/x-krita", "application/x-krita" ]
+    "MimeTypes": [ "application/x-krita" ]
 }
-
--- a/src/imageformats/ora.cpp
+++ b/src/imageformats/ora.cpp
@ -17,6 +17,9 @@

 #include <kzip.h>

+static constexpr char s_magic[] = "image/openraster";
+static constexpr int s_magic_size = sizeof(s_magic) - 1; // -1 to remove the last \0
+
 OraHandler::OraHandler()
 {
 }
@ -35,7 +38,7 @@ bool OraHandler::read(QImage *image)
    KZip zip(device());
    if (!zip.open(QIODevice::ReadOnly)) return false;

-    const KArchiveEntry *entry = zip.directory()->entry(QLatin1String("mergedimage.png"));
+    const KArchiveEntry *entry = zip.directory()->entry(QStringLiteral("mergedimage.png"));
    if (!entry || !entry->isFile()) return false;

    const KZipFileEntry* fileZipEntry = static_cast<const KZipFileEntry*>(entry);
@ -54,7 +57,7 @@ bool OraHandler::canRead(QIODevice *device)

    char buff[54];
    if (device->peek(buff, sizeof(buff)) == sizeof(buff))
-        return qstrcmp(buff + 0x26, "image/openraster") == 0;
+        return memcmp(buff + 0x26, s_magic, s_magic_size) == 0;

    return false;
 }
--- a/src/imageformats/ora.h
+++ b/src/imageformats/ora.h
@ -17,8 +17,8 @@ class OraHandler : public QImageIOHandler
 public:
    OraHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image)  Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image)  override;

    static bool canRead(QIODevice *device);
 };
@ -29,8 +29,8 @@ class OraPlugin : public QImageIOPlugin
    Q_OBJECT
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "ora.json")
 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };


--- a/src/imageformats/ora.json
+++ b/src/imageformats/ora.json
@ -1,5 +1,4 @@
 {
    "Keys": [ "ora" ],
-    "MimeTypes": [ "image/openraster", "image/openraster" ]
+    "MimeTypes": [ "image/openraster" ]
 }
-
--- a/src/imageformats/pcx.cpp
+++ b/src/imageformats/pcx.cpp
@ -11,7 +11,7 @@

 #include <QColor>
 #include <QDataStream>
-// #include <QDebug>
+#include <QDebug>
 #include <QImage>


@ -23,7 +23,7 @@ public:
    quint8 g;
    quint8 b;

-    static RGB from(const QRgb &color)
+    static RGB from(const QRgb color)
    {
        RGB c;
        c.r = qRed(color);
@ -169,7 +169,7 @@ static QDataStream &operator>>(QDataStream &s, PCXHEADER &ph)
    return s;
 }

-static QDataStream &operator<<(QDataStream &s, const RGB &rgb)
+static QDataStream &operator<<(QDataStream &s, const RGB rgb)
 {
    s << rgb.r << rgb.g << rgb.b;

@ -253,6 +253,9 @@ static void readImage1(QImage &img, QDataStream &s, const PCXHEADER &header)
    img = QImage(header.width(), header.height(), QImage::Format_Mono);
    img.setColorCount(2);

+    if (img.isNull())
+        return;
+
    for (int y = 0; y < header.height(); ++y) {
        if (s.atEnd()) {
            img = QImage();
@ -325,6 +328,10 @@ static void readImage8(QImage &img, QDataStream &s, const PCXHEADER &header)
        readLine(s, buf, header);

        uchar *p = img.scanLine(y);
+
+        if (!p)
+            return;
+
        unsigned int bpl = qMin(header.BytesPerLine, (quint16)header.width());
        for (unsigned int x = 0; x < bpl; ++x) {
            p[ x ] = buf[ x ];
--- a/src/imageformats/pcx_p.h
+++ b/src/imageformats/pcx_p.h
@ -7,8 +7,8 @@
   version 2 of the License, or (at your option) any later version.
 */

-#ifndef KIMG_PCX_H
-#define KIMG_PCX_H
+#ifndef KIMG_PCX_P_H
+#define KIMG_PCX_P_H

 #include <QImageIOPlugin>

@ -17,9 +17,9 @@ class PCXHandler : public QImageIOHandler
 public:
    PCXHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;

    static bool canRead(QIODevice *device);
 };
@ -30,8 +30,8 @@ class PCXPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "pcx.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

-#endif // KIMG_PCX_H
+#endif // KIMG_PCX_P_H
--- a/src/imageformats/pic.cpp
+++ b/src/imageformats/pic.cpp
@ -17,7 +17,7 @@
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 * ----------------------------------------------------------------------------
 */

@ -59,7 +59,10 @@ static QDataStream &operator>> (QDataStream &s, PicHeader &header)
    header.comment = QByteArray(comment);

    header.id.resize(4);
-    s.readRawData(header.id.data(), 4);
+    const int bytesRead = s.readRawData(header.id.data(), 4);
+    if (bytesRead != 4) {
+        header.id.resize(bytesRead);
+    }

    s >> header.width;
    s >> header.height;
@ -170,9 +173,9 @@ static QDataStream &operator<< (QDataStream &s, const QList<PicChannel> &channel
    return s;
 }

-static bool readRow(QDataStream &stream, QRgb *row, quint16 width, QList<PicChannel> channels)
+static bool readRow(QDataStream &stream, QRgb *row, quint16 width, const QList<PicChannel> &channels)
 {
-    Q_FOREACH(const PicChannel &channel, channels) {
+    for(const PicChannel &channel : channels) {
        auto readPixel = [&] (QDataStream &str) -> QRgb {
            quint8 red = 0;
            if (channel.code & RED) {
@ -239,7 +242,7 @@ bool SoftimagePICHandler::read(QImage *image)
    }

    QImage::Format fmt = QImage::Format_RGB32;
-    Q_FOREACH(const PicChannel &channel, m_channels) {
+    for (const PicChannel &channel : qAsConst(m_channels)) {
        if (channel.size != 8) {
            // we cannot read images that do not come in bytes
            qDebug() << "Channel size was" << channel.size;
@ -385,8 +388,8 @@ void SoftimagePICHandler::setOption(ImageOption option, const QVariant &value)
            break;
        case Description: {
            m_description.clear();
-            QStringList entries = value.toString().split(QStringLiteral("\n\n"));
-            Q_FOREACH(const QString entry, entries) {
+            const QStringList entries = value.toString().split(QStringLiteral("\n\n"));
+            for (const QString &entry : entries) {
                if (entry.startsWith(QStringLiteral("Description: "))) {
                    m_description = entry.mid(13).simplified().toUtf8();
                }
@ -422,7 +425,7 @@ QVariant SoftimagePICHandler::option(ImageOption option) const
            return QString();
        case ImageFormat:
            if (const_cast<SoftimagePICHandler*>(this)->readChannels()) {
-                Q_FOREACH (const PicChannel &channel, m_channels) {
+                for (const PicChannel &channel : qAsConst(m_channels)) {
                    if (channel.code & ALPHA) {
                        return QImage::Format_ARGB32;
                    }
--- a/src/imageformats/pic_p.h
+++ b/src/imageformats/pic_p.h
@ -14,12 +14,12 @@
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 * ----------------------------------------------------------------------------
 */

-#ifndef KIMG_PIC_H
-#define KIMG_PIC_H
+#ifndef KIMG_PIC_P_H
+#define KIMG_PIC_P_H

 #include <QImageIOPlugin>
 #include <QDataStream>
@ -154,13 +154,13 @@ struct PicChannel {
 class SoftimagePICHandler : public QImageIOHandler
 {
 public:
-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &) override;

-    QVariant option(ImageOption option) const Q_DECL_OVERRIDE;
-    void setOption(ImageOption option, const QVariant &value) Q_DECL_OVERRIDE;
-    bool supportsOption(ImageOption option) const Q_DECL_OVERRIDE;
+    QVariant option(ImageOption option) const override;
+    void setOption(ImageOption option, const QVariant &value) override;
+    bool supportsOption(ImageOption option) const override;

    static bool canRead(QIODevice *device);

@ -195,8 +195,8 @@ class SoftimagePICPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "pic.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

-#endif // KIMG_PIC_H
+#endif // KIMG_PIC_P_H
--- a/src/imageformats/pnm.desktop
+++ b/src/imageformats/pnm.desktop
@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Service
-X-KDE-ServiceTypes=QImageIOPlugins
-X-KDE-ImageFormat=pnm
-X-KDE-MimeType=image/x-portable-anymap
-X-KDE-Read=true
-X-KDE-Write=false
--- a/src/imageformats/psd.cpp
+++ b/src/imageformats/psd.cpp
@ -16,7 +16,7 @@
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */

 /*
@ -177,6 +177,10 @@ static bool LoadPSD(QDataStream &stream, const PSDHeader &header, QImage &img)

    QRgb *image_data = reinterpret_cast<QRgb*>(img.bits());

+    if (!image_data) {
+        return false;
+    }
+
    static const channelUpdater updaters[4] = {
        updateRed,
        updateGreen,
--- a/src/imageformats/psd_p.h
+++ b/src/imageformats/psd_p.h
@ -7,8 +7,8 @@
   version 2 of the License, or (at your option) any later version.
 */

-#ifndef KIMG_PSD_H
-#define KIMG_PSD_H
+#ifndef KIMG_PSD_P_H
+#define KIMG_PSD_P_H

 #include <QImageIOPlugin>

@ -17,8 +17,8 @@ class PSDHandler : public QImageIOHandler
 public:
    PSDHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;

    static bool canRead(QIODevice *device);
 };
@ -29,9 +29,9 @@ class PSDPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "psd.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

-#endif // KIMG_PSD_H
+#endif // KIMG_PSD_P_H

--- a/src/imageformats/ras.cpp
+++ b/src/imageformats/ras.cpp
@ -12,8 +12,8 @@
 #include "ras_p.h"

 #include <QImage>
-#include <QtCore/QDataStream>
-// #include <QDebug>
+#include <QDataStream>
+#include <QDebug>

 namespace   // Private.
 {
@ -102,6 +102,13 @@ static bool IsSupported(const RasHeader &head)
 static bool LoadRAS(QDataStream &s, const RasHeader &ras, QImage &img)
 {
    s.device()->seek(RasHeader::SIZE);
+
+    // QVector uses some extra space for stuff, hence the 32 here suggested by thiago
+    if (ras.ColorMapLength > std::numeric_limits<int>::max() - 32) {
+        qWarning() << "LoadRAS() unsupported image color map length in file header" << ras.ColorMapLength;
+        return false;
+    }
+
    // Read palette if needed.
    QVector<quint8> palette(ras.ColorMapLength);
    if (ras.ColorMapType == 1) {
@ -110,19 +117,36 @@ static bool LoadRAS(QDataStream &s, const RasHeader &ras, QImage &img)
        }
    }

+    const int bpp = ras.Depth / 8;
+    if (ras.Height == 0) {
+        return false;
+    }
+    if (bpp == 0) {
+        return false;
+    }
+    if (ras.Length / ras.Height / bpp < ras.Width) {
+        qWarning() << "LoadRAS() mistmatch between height and width" << ras.Width << ras.Height << ras.Length << ras.Depth;
+        return false;
+    }
+    // QVector uses some extra space for stuff, hence the 32 here suggested by thiago
+    if (ras.Length > std::numeric_limits<int>::max() - 32) {
+        qWarning() << "LoadRAS() unsupported image length in file header" << ras.Length;
+        return false;
+    }
+
    // each line must be a factor of 16 bits, so they may contain padding
    // this will be 1 if padding required, 0 otherwise
-    int paddingrequired = (ras.Width * (ras.Depth / 8) % 2);
+    const int paddingrequired = (ras.Width * bpp % 2);

    // qDebug() << "paddingrequired: " << paddingrequired;
    // don't trust ras.Length
    QVector<quint8> input(ras.Length);

    int i = 0;
-    while (! s.atEnd()) {
+    while (! s.atEnd() && i < input.size()) {
        s >> input[i];
        // I guess we need to find out if we're at the end of a line
-        if (paddingrequired && i != 0 && !(i % (ras.Width * (ras.Depth / 8)))) {
+        if (paddingrequired && i != 0 && !(i % (ras.Width * bpp))) {
            s >> input[i];
        }
        i++;
@ -131,15 +155,18 @@ static bool LoadRAS(QDataStream &s, const RasHeader &ras, QImage &img)
    // Allocate image
    img = QImage(ras.Width, ras.Height, QImage::Format_ARGB32);

+    if (img.isNull())
+        return false;
+
    // Reconstruct image from RGB palette if we have a palette
    // TODO: make generic so it works with 24bit or 32bit palettes
    if (ras.ColorMapType == 1 && ras.Depth == 8) {
        quint8 red, green, blue;
        for (quint32 y = 0; y < ras.Height; y++) {
            for (quint32 x = 0; x < ras.Width; x++) {
-                red = palette[(int)input[y * ras.Width + x]];
-                green = palette[(int)input[y * ras.Width + x] + (ras.ColorMapLength / 3)];
-                blue = palette[(int)input[y * ras.Width + x] + 2 * (ras.ColorMapLength / 3)];
+                red = palette.value((int)input[y * ras.Width + x]);
+                green = palette.value((int)input[y * ras.Width + x] + (ras.ColorMapLength / 3));
+                blue = palette.value((int)input[y * ras.Width + x] + 2 * (ras.ColorMapLength / 3));
                img.setPixel(x, y, qRgb(red, green, blue));
            }
        }
@ -248,6 +275,10 @@ bool RASHandler::read(QImage *outImage)
    // Read image header.
    RasHeader ras;
    s >> ras;
+
+    if (ras.ColorMapLength > std::numeric_limits<int>::max())
+        return false;
+
    // TODO: add support for old versions of RAS where Length may be zero in header
    s.device()->seek(RasHeader::SIZE + ras.Length + ras.ColorMapLength);

--- a/src/imageformats/ras_p.h
+++ b/src/imageformats/ras_p.h
@ -8,8 +8,8 @@
   version 2 of the License, or (at your option) any later version.
 */

-#ifndef KIMG_RAS_H
-#define KIMG_RAS_H
+#ifndef KIMG_RAS_P_H
+#define KIMG_RAS_P_H

 #include <QImageIOPlugin>

@ -18,8 +18,8 @@ class RASHandler : public QImageIOHandler
 public:
    RASHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;

    static bool canRead(QIODevice *device);
 };
@ -30,9 +30,9 @@ class RASPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "ras.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

-#endif // KIMG_RAS_H
+#endif // KIMG_RAS_P_H

--- a/src/imageformats/rgb.cpp
+++ b/src/imageformats/rgb.cpp
@ -23,11 +23,11 @@

 #include "rgb_p.h"

-#include <QtCore/QMap>
-#include <QtCore/QVector>
+#include <QMap>
+#include <QVector>

 #include <QImage>
-// #include <QDebug>
+#include <QDebug>

 class RLEData : public QVector<uchar>
 {
@ -144,13 +144,16 @@ bool SGIImage::getRow(uchar *dest)
        if (_bpc == 2) {
            _pos++;
        }
+        if (_pos >= _data.end()) {
+            return false;
+        }
        n = *_pos & 0x7f;
        if (!n) {
            break;
        }

        if (*_pos++ & 0x80) {
-            for (; i < _xsize && n--; i++) {
+            for (; i < _xsize && _pos < _data.end() && n--; i++) {
                *dest++ = *_pos;
                _pos += _bpc;
            }
@ -309,16 +312,23 @@ bool SGIImage::readImage(QImage &img)
        return false;
    }

-    _numrows = _ysize * _zsize;
-
    img = QImage(_xsize, _ysize, QImage::Format_RGB32);

+    if (_zsize == 0 )
+        return false;
+
    if (_zsize == 2 || _zsize == 4) {
        img = img.convertToFormat(QImage::Format_ARGB32);
    } else if (_zsize > 4) {
 //         qDebug() << "using first 4 of " << _zsize << " channels";
+        // Only let this continue if it won't cause a int overflow later
+        // this is most likely a broken file anyway
+        if (_ysize > std::numeric_limits<int>::max() / _zsize)
+            return false;
    }

+    _numrows = _ysize * _zsize;
+
    if (_rle) {
        uint l;
        _starttab = new quint32[_numrows];
@ -326,6 +336,9 @@ bool SGIImage::readImage(QImage &img)
            _stream >> _starttab[l];
            _starttab[l] -= 512 + _numrows * 2 * sizeof(quint32);
        }
+        for (; l < _numrows; l++) {
+            _starttab[l] = 0;
+        }

        _lengthtab = new quint32[_numrows];
        for (l = 0; l < _numrows; l++) {
@ -686,8 +699,8 @@ bool RGBHandler::canRead(QIODevice *device)
        return false;
    }

-    qint64 oldPos = device->pos();
-    QByteArray head = device->readLine(64);
+    const qint64 oldPos = device->pos();
+    const QByteArray head = device->readLine(64);
    int readBytes = head.size();

    if (device->isSequential()) {
@ -699,10 +712,7 @@ bool RGBHandler::canRead(QIODevice *device)
        device->seek(oldPos);
    }

-    const QRegExp regexp(QLatin1String("^\x01\xda\x01[\x01\x02]"));
-    QString data(QString::fromLocal8Bit(head));
-
-    return data.contains(regexp);
+    return head.size() >= 4 && head.startsWith("\x01\xda") && (head[2] == 0 || head[2] == 1) && (head[3] == 1 || head[3] == 2);
 }

 ///////////////////////////////////////////////////////////////////////////////
--- a/src/imageformats/rgb_p.h
+++ b/src/imageformats/rgb_p.h
@ -7,8 +7,8 @@
 // published by the Free Software Foundation; either version 2 of the
 // License, or (at your option) any later version.

-#ifndef KIMG_RGB_H
-#define KIMG_RGB_H
+#ifndef KIMG_RGB_P_H
+#define KIMG_RGB_P_H

 #include <QImageIOPlugin>

@ -17,9 +17,9 @@ class RGBHandler : public QImageIOHandler
 public:
    RGBHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;

    static bool canRead(QIODevice *device);
 };
@ -30,9 +30,9 @@ class RGBPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "rgb.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

-#endif // KIMG_RGB_H
+#endif // KIMG_RGB_P_H

--- a/src/imageformats/rle_p.h
+++ b/src/imageformats/rle_p.h
@ -14,12 +14,12 @@
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 * ----------------------------------------------------------------------------
 */

-#ifndef KIMAGEFORMATS_RLE_H
-#define KIMAGEFORMATS_RLE_H
+#ifndef KIMAGEFORMATS_RLE_P_H
+#define KIMAGEFORMATS_RLE_P_H

 #include <QDebug>
 #include <QDataStream>
@ -220,4 +220,4 @@ static inline void encodeRLEData(RLEVariant variant,
    }
 }

-#endif // KIMAGEFORMATS_RLE_H
+#endif // KIMAGEFORMATS_RLE_P_H
--- a/src/imageformats/tga.cpp
+++ b/src/imageformats/tga.cpp
@ -23,8 +23,8 @@
 #include <assert.h>

 #include <QImage>
-#include <QtCore/QDataStream>
-// #include <QDebug>
+#include <QDataStream>
+#include <QDebug>

 typedef quint32 uint;
 typedef quint16 ushort;
@ -145,9 +145,7 @@ struct TgaHeaderInfo {
        switch (tga.image_type) {
        case TGA_TYPE_RLE_INDEXED:
            rle = true;
-#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
        Q_FALLTHROUGH();
-#endif
        // no break is intended!
        case TGA_TYPE_INDEXED:
            pal = true;
@ -155,9 +153,7 @@ struct TgaHeaderInfo {

        case TGA_TYPE_RLE_RGB:
            rle = true;
-#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
        Q_FALLTHROUGH();
-#endif
        // no break is intended!
        case TGA_TYPE_RGB:
            rgb = true;
@ -165,9 +161,7 @@ struct TgaHeaderInfo {

        case TGA_TYPE_RLE_GREY:
            rle = true;
-#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
        Q_FALLTHROUGH();
-#endif
        // no break is intended!
        case TGA_TYPE_GREY:
            grey = true;
@ -192,10 +186,14 @@ static bool LoadTGA(QDataStream &s, const TgaHeader &tga, QImage &img)
    // However alpha exists only in the 32 bit format.
    if ((tga.pixel_size == 32) && (tga.flags & 0xf)) {
        img = QImage(tga.width, tga.height, QImage::Format_ARGB32);
+
+        if (numAlphaBits > 8) {
+            return false;
+        }
    }

    uint pixel_size = (tga.pixel_size / 8);
-    uint size = tga.width * tga.height * pixel_size;
+    qint64 size = qint64(tga.width) * qint64(tga.height) * pixel_size;

    if (size < 1) {
 //          qDebug() << "This TGA file is broken with size " << size;
@ -203,33 +201,61 @@ static bool LoadTGA(QDataStream &s, const TgaHeader &tga, QImage &img)
    }

    // Read palette.
-    char palette[768];
+    static const int max_palette_size = 768;
+    char palette[max_palette_size];
    if (info.pal) {
        // @todo Support palettes in other formats!
-        s.readRawData(palette, 3 * tga.colormap_length);
+        const int palette_size = 3 * tga.colormap_length;
+        if (palette_size > max_palette_size) {
+            return false;
+        }
+        const int dataRead = s.readRawData(palette, palette_size);
+        if (dataRead < 0) {
+            return false;
+        }
+        if (dataRead < max_palette_size) {
+            memset(&palette[dataRead], 0, max_palette_size - dataRead);
+        }
    }

    // Allocate image.
-    uchar *const image = new uchar[size];
+    uchar *const image = reinterpret_cast<uchar*>(malloc(size));
+    if (!image) {
+        return false;
+    }
+
+    bool valid = true;

    if (info.rle) {
        // Decode image.
        char *dst = (char *)image;
-        int num = size;
+        qint64 num = size;

        while (num > 0) {
+            if (s.atEnd()) {
+                valid = false;
+                break;
+            }
+
            // Get packet header.
            uchar c;
            s >> c;

            uint count = (c & 0x7f) + 1;
            num -= count * pixel_size;
+            if (num < 0) {
+                valid = false;
+                break;
+            }

            if (c & 0x80) {
                // RLE pixels.
                assert(pixel_size <= 8);
                char pixel[8];
-                s.readRawData(pixel, pixel_size);
+                const int dataRead = s.readRawData(pixel, pixel_size);
+                if (dataRead < (int)pixel_size) {
+                    memset(&pixel[dataRead], 0, pixel_size - dataRead);
+                }
                do {
                    memcpy(dst, pixel, pixel_size);
                    dst += pixel_size;
@ -237,13 +263,32 @@ static bool LoadTGA(QDataStream &s, const TgaHeader &tga, QImage &img)
            } else {
                // Raw pixels.
                count *= pixel_size;
-                s.readRawData(dst, count);
+                const int dataRead = s.readRawData(dst, count);
+                if (dataRead < 0) {
+                    free(image);
+                    return false;
+                }
+                if ((uint)dataRead < count) {
+                    memset(&dst[dataRead], 0, count - dataRead);
+                }
                dst += count;
            }
        }
    } else {
        // Read raw image.
-        s.readRawData((char *)image, size);
+        const int dataRead = s.readRawData((char *)image, size);
+        if (dataRead < 0) {
+            free(image);
+            return false;
+        }
+        if (dataRead < size) {
+            memset(&image[dataRead], 0, size - dataRead);
+        }
+    }
+
+    if (!valid) {
+        free(image);
+        return false;
    }

    // Convert image to internal format.
@ -300,7 +345,7 @@ static bool LoadTGA(QDataStream &s, const TgaHeader &tga, QImage &img)
    }

    // Free image.
-    delete [] image;
+    free(image);

    return true;
 }
--- a/src/imageformats/tga_p.h
+++ b/src/imageformats/tga_p.h
@ -7,8 +7,8 @@
   version 2 of the License, or (at your option) any later version.
 */

-#ifndef KIMG_TGA_H
-#define KIMG_TGA_H
+#ifndef KIMG_TGA_P_H
+#define KIMG_TGA_P_H

 #include <QImageIOPlugin>

@ -17,9 +17,9 @@ class TGAHandler : public QImageIOHandler
 public:
    TGAHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;

    static bool canRead(QIODevice *device);
 };
@ -30,8 +30,8 @@ class TGAPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "tga.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

-#endif // KIMG_TGA_H
+#endif // KIMG_TGA_P_H
--- a/src/imageformats/xcf.cpp
+++ b/src/imageformats/xcf.cpp
@ -24,10 +24,12 @@
 #include <stdlib.h>
 #include <QImage>
 #include <QPainter>
-#include <QtCore/QIODevice>
-#include <QtCore/QStack>
-#include <QtCore/QVector>
-// #include <QDebug>
+#include <QIODevice>
+#include <QStack>
+#include <QVector>
+#include <QDebug>
+
+#include <string.h>

 #include "gimp_p.h"

@ -86,16 +88,17 @@ private:
        } mask_channel;

        bool active;            //!< Is this layer the active layer?
-        quint32 opacity;        //!< The opacity of the layer
-        quint32 visible;        //!< Is the layer visible?
+        quint32 opacity = 255;  //!< The opacity of the layer
+        quint32 visible = 1;    //!< Is the layer visible?
        quint32 linked;     //!< Is this layer linked (geometrically)
        quint32 preserve_transparency; //!< Preserve alpha when drawing on layer?
-        quint32 apply_mask;     //!< Apply the layer mask?
+        quint32 apply_mask = 9; //!< Apply the layer mask? Use 9 as "uninitilized". Spec says "If the property does not appear for a layer which has a layer mask, it defaults to true (1).
+                                //   Robust readers should force this to false if the layer has no layer mask.
        quint32 edit_mask;      //!< Is the layer mask the being edited?
        quint32 show_mask;      //!< Show the layer mask rather than the image?
-        qint32 x_offset;        //!< x offset of the layer relative to the image
-        qint32 y_offset;        //!< y offset of the layer relative to the image
-        quint32 mode;           //!< Combining mode of layer (LayerModeEffects)
+        qint32 x_offset = 0;    //!< x offset of the layer relative to the image
+        qint32 y_offset = 0;    //!< y offset of the layer relative to the image
+        quint32 mode = 0;       //!< Combining mode of layer (LayerModeEffects)
        quint32 tattoo;     //!< (unique identifier?)

        //! As each tile is read from the file, it is buffered here.
@ -112,6 +115,9 @@ private:
        {
            delete[] name;
        }
+
+        Layer(const Layer &) = delete;
+        Layer &operator=(const Layer &) = delete;
    };

    /*!
@ -126,11 +132,11 @@ private:
        qint32 type;            //!< type of the XCF image (GimpImageBaseType)

        quint8 compression;     //!< tile compression method (CompressionType)
-        float x_resolution;     //!< x resolution in dots per inch
-        float y_resolution;     //!< y resolution in dots per inch
+        float x_resolution = -1;//!< x resolution in dots per inch
+        float y_resolution = -1;//!< y resolution in dots per inch
        qint32 tattoo;          //!< (unique identifier?)
        quint32 unit;           //!< Units of The GIMP (inch, mm, pica, etc...)
-        qint32 num_colors;      //!< number of colors in an indexed image
+        qint32 num_colors = 0;  //!< number of colors in an indexed image
        QVector<QRgb> palette;          //!< indexed image color palette

        int num_layers;         //!< number of layers
@ -161,11 +167,11 @@ private:

    //! The bottom-most layer is copied into the final QImage by this
    //! routine.
-    typedef void (*PixelCopyOperation)(Layer &layer, uint i, uint j, int k, int l,
+    typedef void (*PixelCopyOperation)(const Layer &layer, uint i, uint j, int k, int l,
                                       QImage &image, int m, int n);

    //! Higher layers are merged into the final QImage by this routine.
-    typedef void (*PixelMergeOperation)(Layer &layer, uint i, uint j, int k, int l,
+    typedef void (*PixelMergeOperation)(const Layer &layer, uint i, uint j, int k, int l,
                                        QImage &image, int m, int n);

    //! Layer mode static data.
@ -178,7 +184,7 @@ private:
    static const LayerModes layer_modes[];

    bool loadImageProperties(QDataStream &xcf_io, XCFImage &image);
-    bool loadProperty(QDataStream &xcf_io, PropType &type, QByteArray &bytes);
+    bool loadProperty(QDataStream &xcf_io, PropType &type, QByteArray &bytes, quint32 &rawType);
    bool loadLayer(QDataStream &xcf_io, XCFImage &xcf_image);
    bool loadLayerProperties(QDataStream &xcf_io, Layer &layer);
    bool composeTiles(XCFImage &xcf_image);
@ -195,37 +201,37 @@ private:
                     int data_length, qint32 bpp);

    static void copyLayerToImage(XCFImage &xcf_image);
-    static void copyRGBToRGB(Layer &layer, uint i, uint j, int k, int l,
+    static void copyRGBToRGB(const Layer &layer, uint i, uint j, int k, int l,
                             QImage &image, int m, int n);
-    static void copyGrayToGray(Layer &layer, uint i, uint j, int k, int l,
+    static void copyGrayToGray(const Layer &layer, uint i, uint j, int k, int l,
                               QImage &image, int m, int n);
-    static void copyGrayToRGB(Layer &layer, uint i, uint j, int k, int l,
+    static void copyGrayToRGB(const Layer &layer, uint i, uint j, int k, int l,
                              QImage &image, int m, int n);
-    static void copyGrayAToRGB(Layer &layer, uint i, uint j, int k, int l,
+    static void copyGrayAToRGB(const Layer &layer, uint i, uint j, int k, int l,
                               QImage &image, int m, int n);
-    static void copyIndexedToIndexed(Layer &layer, uint i, uint j, int k, int l,
+    static void copyIndexedToIndexed(const Layer &layer, uint i, uint j, int k, int l,
                                     QImage &image, int m, int n);
-    static void copyIndexedAToIndexed(Layer &layer, uint i, uint j, int k, int l,
+    static void copyIndexedAToIndexed(const Layer &layer, uint i, uint j, int k, int l,
                                      QImage &image, int m, int n);
-    static void copyIndexedAToRGB(Layer &layer, uint i, uint j, int k, int l,
+    static void copyIndexedAToRGB(const Layer &layer, uint i, uint j, int k, int l,
                                  QImage &image, int m, int n);

    static void mergeLayerIntoImage(XCFImage &xcf_image);
-    static void mergeRGBToRGB(Layer &layer, uint i, uint j, int k, int l,
+    static void mergeRGBToRGB(const Layer &layer, uint i, uint j, int k, int l,
                              QImage &image, int m, int n);
-    static void mergeGrayToGray(Layer &layer, uint i, uint j, int k, int l,
+    static void mergeGrayToGray(const Layer &layer, uint i, uint j, int k, int l,
                                QImage &image, int m, int n);
-    static void mergeGrayAToGray(Layer &layer, uint i, uint j, int k, int l,
+    static void mergeGrayAToGray(const Layer &layer, uint i, uint j, int k, int l,
                                 QImage &image, int m, int n);
-    static void mergeGrayToRGB(Layer &layer, uint i, uint j, int k, int l,
+    static void mergeGrayToRGB(const Layer &layer, uint i, uint j, int k, int l,
                               QImage &image, int m, int n);
-    static void mergeGrayAToRGB(Layer &layer, uint i, uint j, int k, int l,
+    static void mergeGrayAToRGB(const Layer &layer, uint i, uint j, int k, int l,
                                QImage &image, int m, int n);
-    static void mergeIndexedToIndexed(Layer &layer, uint i, uint j, int k, int l,
+    static void mergeIndexedToIndexed(const Layer &layer, uint i, uint j, int k, int l,
                                      QImage &image, int m, int n);
-    static void mergeIndexedAToIndexed(Layer &layer, uint i, uint j, int k, int l,
+    static void mergeIndexedAToIndexed(const Layer &layer, uint i, uint j, int k, int l,
                                       QImage &image, int m, int n);
-    static void mergeIndexedAToRGB(Layer &layer, uint i, uint j, int k, int l,
+    static void mergeIndexedAToRGB(const Layer &layer, uint i, uint j, int k, int l,
                                   QImage &image, int m, int n);

    static void initializeRandomTable();
@ -238,6 +244,12 @@ bool XCFImageFormat::random_table_initialized;

 QVector<QRgb> XCFImageFormat::grayTable;

+template <typename T, size_t N>
+constexpr size_t countof(T(&)[N])
+{
+    return N;
+}
+
 const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = {
    {true},     // NORMAL_MODE
    {true},     // DISSOLVE_MODE
@ -264,7 +276,7 @@ const XCFImageFormat::LayerModes XCFImageFormat::layer_modes[] = {
 };

 //! Change a QRgb value's alpha only.
-inline QRgb qRgba(const QRgb &rgb, int a)
+inline QRgb qRgba(const QRgb rgb, int a)
 {
    return ((a & 0xff) << 24 | (rgb & RGB_MASK));
 }
@ -384,8 +396,9 @@ bool XCFImageFormat::loadImageProperties(QDataStream &xcf_io, XCFImage &xcf_imag
    while (true) {
        PropType type;
        QByteArray bytes;
+        quint32 rawType;

-        if (!loadProperty(xcf_io, type, bytes)) {
+        if (!loadProperty(xcf_io, type, bytes, rawType)) {
 //          qDebug() << "XCF: error loading global image properties";
            return false;
        }
@ -444,6 +457,7 @@ bool XCFImageFormat::loadImageProperties(QDataStream &xcf_io, XCFImage &xcf_imag
                return false;
            }

+            xcf_image.palette = QVector<QRgb>();
            xcf_image.palette.reserve(xcf_image.num_colors);

            for (int i = 0; i < xcf_image.num_colors; i++) {
@ -454,7 +468,7 @@ bool XCFImageFormat::loadImageProperties(QDataStream &xcf_io, XCFImage &xcf_imag
            break;

        default:
-//                  qDebug() << "XCF: unimplemented image property" << type
+//                  qDebug() << "XCF: unimplemented image property" << rawType
 //                          << ", size " << bytes.size() << endl;
            break;
        }
@ -468,11 +482,16 @@ bool XCFImageFormat::loadImageProperties(QDataStream &xcf_io, XCFImage &xcf_imag
 * \param type returns with the property type.
 * \param bytes returns with the property data.
 * \return true if there were no IO errors.  */
-bool XCFImageFormat::loadProperty(QDataStream &xcf_io, PropType &type, QByteArray &bytes)
+bool XCFImageFormat::loadProperty(QDataStream &xcf_io, PropType &type, QByteArray &bytes, quint32 &rawType)
 {
-    quint32 foo;
-    xcf_io >> foo;
-    type = PropType(foo); // TODO urks
+    xcf_io >> rawType;
+    if (rawType >= MAX_SUPPORTED_PROPTYPE) {
+        type = MAX_SUPPORTED_PROPTYPE;
+        // return true because we don't really want to totally fail on an unsupported property since it may not be fatal
+        return true;
+    }
+
+    type = PropType(rawType);

    char *data = nullptr;
    quint32 size;
@ -486,11 +505,12 @@ bool XCFImageFormat::loadProperty(QDataStream &xcf_io, PropType &type, QByteArra
        quint32 ncolors;
        xcf_io >> ncolors;

+        size = 3 * ncolors + 4;
+
        if (size > 65535 || size < 4) {
            return false;
        }

-        size = 3 * ncolors + 4;
        data = new char[size];

        // since we already read "ncolors" from the stream, we put that data back
@ -528,7 +548,11 @@ bool XCFImageFormat::loadProperty(QDataStream &xcf_io, PropType &type, QByteArra
            return false;
        }
        data = new char[size];
-        xcf_io.readRawData(data, size);
+        const quint32 dataRead = xcf_io.readRawData(data, size);
+        if (dataRead < size) {
+//          qDebug() << "XCF: loadProperty read less data than expected" << data_length << dataRead;
+            memset(&data[dataRead], 0, size - dataRead);
+        }
    }

    if (size != 0 && data) {
@ -595,11 +619,19 @@ bool XCFImageFormat::loadLayer(QDataStream &xcf_io, XCFImage &xcf_image)
    }

    if (layer.mask_offset != 0) {
+        // 9 means its not on the file. Spec says "If the property does not appear for a layer which has a layer mask, it defaults to true (1).
+        if (layer.apply_mask == 9) {
+            layer.apply_mask = 1;
+        }
+
        xcf_io.device()->seek(layer.mask_offset);

        if (!loadMask(xcf_io, layer)) {
            return false;
        }
+    } else {
+        // Spec says "Robust readers should force this to false if the layer has no layer mask."
+        layer.apply_mask = 0;
    }

    // Now we should have enough information to initialize the final
@ -631,8 +663,9 @@ bool XCFImageFormat::loadLayerProperties(QDataStream &xcf_io, Layer &layer)
    while (true) {
        PropType type;
        QByteArray bytes;
+        quint32 rawType;

-        if (!loadProperty(xcf_io, type, bytes)) {
+        if (!loadProperty(xcf_io, type, bytes, rawType)) {
 //          qDebug() << "XCF: error loading layer properties";
            return false;
        }
@ -649,6 +682,7 @@ bool XCFImageFormat::loadLayerProperties(QDataStream &xcf_io, Layer &layer)

        case PROP_OPACITY:
            property >> layer.opacity;
+            layer.opacity = std::min(layer.opacity, 255u);
            break;

        case PROP_VISIBLE:
@ -681,6 +715,10 @@ bool XCFImageFormat::loadLayerProperties(QDataStream &xcf_io, Layer &layer)

        case PROP_MODE:
            property >> layer.mode;
+            if (layer.mode >= countof(layer_modes)) {
+                qWarning() << "Found layer with unsupported mode" << layer.mode << "Defaulting to mode 0";
+                layer.mode = 0;
+            }
            break;

        case PROP_TATTOO:
@ -688,7 +726,7 @@ bool XCFImageFormat::loadLayerProperties(QDataStream &xcf_io, Layer &layer)
            break;

        default:
-//              qDebug() << "XCF: unimplemented layer property " << type
+//              qDebug() << "XCF: unimplemented layer property " << rawType
 //                      << ", size " << bytes.size() << endl;
            break;
        }
@ -713,7 +751,8 @@ bool XCFImageFormat::composeTiles(XCFImage &xcf_image)

    // SANITY CHECK: Catch corrupted XCF image file where the width or height
    // of a tile is reported are bogus. See Bug# 234030.
-    if (layer.width > 32767 || layer.height > 32767 || layer.width * layer.height > 16384 * 16384) {
+    if (layer.width > 32767 || layer.height > 32767
+        || (sizeof(void *) == 4 && layer.width * layer.height > 16384 * 16384)) {
        return false;
    }

@ -872,7 +911,7 @@ void XCFImageFormat::setPalette(XCFImage &xcf_image, QImage &image)
 void XCFImageFormat::assignImageBytes(Layer &layer, uint i, uint j)
 {
    QImage &image = layer.image_tiles[j][i];
-    uchar *tile = layer.tile;
+    const uchar *tile = layer.tile;
    const int width = image.width();
    const int height = image.height();
    const int bytesPerLine = image.bytesPerLine();
@ -952,6 +991,46 @@ bool XCFImageFormat::loadHierarchy(QDataStream &xcf_io, Layer &layer)

    xcf_io >> width >> height >> bpp >> offset;

+    // make sure bpp is correct and complain if it is not
+    switch (layer.type) {
+        case RGB_GIMAGE:
+            if (bpp != 3) {
+                qWarning() << "Found layer of type RGB but with bpp != 3" << bpp;
+                bpp = 3;
+            }
+            break;
+        case RGBA_GIMAGE:
+            if (bpp != 4) {
+                qWarning() << "Found layer of type RGBA but with bpp != 4" << bpp;
+                bpp = 4;
+            }
+            break;
+        case GRAY_GIMAGE:
+            if (bpp != 1) {
+                qWarning() << "Found layer of type Gray but with bpp != 1" << bpp;
+                bpp = 1;
+            }
+            break;
+        case GRAYA_GIMAGE:
+            if (bpp != 2) {
+                qWarning() << "Found layer of type Gray+Alpha but with bpp != 2" << bpp;
+                bpp = 2;
+            }
+            break;
+        case INDEXED_GIMAGE:
+            if (bpp != 1) {
+                qWarning() << "Found layer of type Indexed but with bpp != 1" << bpp;
+                bpp = 1;
+            }
+            break;
+        case INDEXEDA_GIMAGE:
+            if (bpp != 2) {
+                qWarning() << "Found layer of type Indexed+Alpha but with bpp != 2" << bpp;
+                bpp = 2;
+            }
+            break;
+    }
+
    // GIMP stores images in a "mipmap"-like format (multiple levels of
    // increasingly lower resolution). Only the top level is used here,
    // however.
@ -994,6 +1073,16 @@ bool XCFImageFormat::loadLevel(QDataStream &xcf_io, Layer &layer, qint32 bpp)
    xcf_io >> width >> height >> offset;

    if (offset == 0) {
+        // offset 0 with rowsxcols != 0 is probably an error since it means we have tiles
+        // without data but just clear the bits for now instead of returning false
+        for (uint j = 0; j < layer.nrows; j++) {
+            for (uint i = 0; i < layer.ncols; i++) {
+                layer.image_tiles[j][i].fill(Qt::transparent);
+                if (layer.type == GRAYA_GIMAGE || layer.type == INDEXEDA_GIMAGE) {
+                    layer.alpha_tiles[j][i].fill(Qt::transparent);
+                }
+            }
+        }
        return true;
    }

@ -1108,7 +1197,11 @@ bool XCFImageFormat::loadTileRLE(QDataStream &xcf_io, uchar *tile, int image_siz

    xcfdata = xcfodata = new uchar[data_length];

-    xcf_io.readRawData((char *)xcfdata, data_length);
+    const int dataRead = xcf_io.readRawData((char *)xcfdata, data_length);
+    if (dataRead < data_length) {
+//      qDebug() << "XCF: read less data than expected" << data_length << dataRead;
+        memset(&xcfdata[dataRead], 0, data_length - dataRead);
+    }

    if (!xcf_io.device()->isOpen()) {
        delete[] xcfodata;
@ -1214,8 +1307,9 @@ bool XCFImageFormat::loadChannelProperties(QDataStream &xcf_io, Layer &layer)
    while (true) {
        PropType type;
        QByteArray bytes;
+        quint32 rawType;

-        if (!loadProperty(xcf_io, type, bytes)) {
+        if (!loadProperty(xcf_io, type, bytes, rawType)) {
 //          qDebug() << "XCF: error loading channel properties";
            return false;
        }
@ -1228,6 +1322,7 @@ bool XCFImageFormat::loadChannelProperties(QDataStream &xcf_io, Layer &layer)

        case PROP_OPACITY:
            property >> layer.mask_channel.opacity;
+            layer.mask_channel.opacity = std::min(layer.mask_channel.opacity, 255u);
            break;

        case PROP_VISIBLE:
@ -1248,7 +1343,7 @@ bool XCFImageFormat::loadChannelProperties(QDataStream &xcf_io, Layer &layer)
            break;

        default:
-//              qDebug() << "XCF: unimplemented channel property " << type
+//              qDebug() << "XCF: unimplemented channel property " << rawType
 //                      << ", size " << bytes.size() << endl;
            break;
        }
@ -1323,9 +1418,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
            image.fill(qRgb(255, 255, 255));
            break;
        } // else, fall through to 32-bit representation
-#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
        Q_FALLTHROUGH();
-#endif
    case RGBA_GIMAGE:
        image = QImage(xcf_image.width, xcf_image.height, QImage::Format_ARGB32);
        if (image.isNull()) {
@ -1345,9 +1438,7 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
            image.fill(255);
            break;
        } // else, fall through to 32-bit representation
-#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
        Q_FALLTHROUGH();
-#endif
    case GRAYA_GIMAGE:
        image = QImage(xcf_image.width, xcf_image.height, QImage::Format_ARGB32);
        if (image.isNull()) {
@ -1432,8 +1523,16 @@ bool XCFImageFormat::initializeImage(XCFImage &xcf_image)
        break;
    }

-    image.setDotsPerMeterX((int)(xcf_image.x_resolution * INCHESPERMETER));
-    image.setDotsPerMeterY((int)(xcf_image.y_resolution * INCHESPERMETER));
+    if (xcf_image.x_resolution > 0 && xcf_image.y_resolution > 0) {
+        const float dpmx = xcf_image.x_resolution * INCHESPERMETER;
+        if (dpmx > std::numeric_limits<int>::max())
+            return false;
+        const float dpmy = xcf_image.y_resolution * INCHESPERMETER;
+        if (dpmy > std::numeric_limits<int>::max())
+            return false;
+        image.setDotsPerMeterX((int)dpmx);
+        image.setDotsPerMeterY((int)dpmy);
+    }
    return true;
 }

@ -1544,7 +1643,7 @@ void XCFImageFormat::copyLayerToImage(XCFImage &xcf_image)
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::copyRGBToRGB(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::copyRGBToRGB(const Layer &layer, uint i, uint j, int k, int l,
                                  QImage &image, int m, int n)
 {
    QRgb src = layer.image_tiles[j][i].pixel(k, l);
@ -1575,7 +1674,7 @@ void XCFImageFormat::copyRGBToRGB(Layer &layer, uint i, uint j, int k, int l,
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::copyGrayToGray(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::copyGrayToGray(const Layer &layer, uint i, uint j, int k, int l,
                                    QImage &image, int m, int n)
 {
    int src = layer.image_tiles[j][i].pixelIndex(k, l);
@ -1595,7 +1694,7 @@ void XCFImageFormat::copyGrayToGray(Layer &layer, uint i, uint j, int k, int l,
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::copyGrayToRGB(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::copyGrayToRGB(const Layer &layer, uint i, uint j, int k, int l,
                                   QImage &image, int m, int n)
 {
    QRgb src = layer.image_tiles[j][i].pixel(k, l);
@ -1616,7 +1715,7 @@ void XCFImageFormat::copyGrayToRGB(Layer &layer, uint i, uint j, int k, int l,
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::copyGrayAToRGB(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::copyGrayAToRGB(const Layer &layer, uint i, uint j, int k, int l,
                                    QImage &image, int m, int n)
 {
    QRgb src = layer.image_tiles[j][i].pixel(k, l);
@ -1644,7 +1743,7 @@ void XCFImageFormat::copyGrayAToRGB(Layer &layer, uint i, uint j, int k, int l,
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::copyIndexedToIndexed(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::copyIndexedToIndexed(const Layer &layer, uint i, uint j, int k, int l,
        QImage &image, int m, int n)
 {
    int src = layer.image_tiles[j][i].pixelIndex(k, l);
@ -1662,7 +1761,7 @@ void XCFImageFormat::copyIndexedToIndexed(Layer &layer, uint i, uint j, int k, i
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::copyIndexedAToIndexed(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::copyIndexedAToIndexed(const Layer &layer, uint i, uint j, int k, int l,
        QImage &image, int m, int n)
 {
    uchar src = layer.image_tiles[j][i].pixelIndex(k, l);
@ -1697,7 +1796,7 @@ void XCFImageFormat::copyIndexedAToIndexed(Layer &layer, uint i, uint j, int k,
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::copyIndexedAToRGB(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::copyIndexedAToRGB(const Layer &layer, uint i, uint j, int k, int l,
                                       QImage &image, int m, int n)
 {
    QRgb src = layer.image_tiles[j][i].pixel(k, l);
@ -1834,7 +1933,7 @@ void XCFImageFormat::mergeLayerIntoImage(XCFImage &xcf_image)
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::mergeRGBToRGB(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::mergeRGBToRGB(const Layer &layer, uint i, uint j, int k, int l,
                                   QImage &image, int m, int n)
 {
    QRgb src = layer.image_tiles[j][i].pixel(k, l);
@ -2135,7 +2234,7 @@ void XCFImageFormat::mergeRGBToRGB(Layer &layer, uint i, uint j, int k, int l,
    uchar new_r, new_g, new_b, new_a;
    new_a = dst_a + INT_MULT(OPAQUE_OPACITY - dst_a, src_a);

-    float src_ratio = (float)src_a / new_a;
+    const float src_ratio = new_a == 0 ? 1.0 : (float)src_a / new_a;
    float dst_ratio = 1.0 - src_ratio;

    new_r = (uchar)(src_ratio * src_r + dst_ratio * dst_r + EPSILON);
@ -2160,7 +2259,7 @@ void XCFImageFormat::mergeRGBToRGB(Layer &layer, uint i, uint j, int k, int l,
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::mergeGrayToGray(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::mergeGrayToGray(const Layer &layer, uint i, uint j, int k, int l,
                                     QImage &image, int m, int n)
 {
    int src = layer.image_tiles[j][i].pixelIndex(k, l);
@ -2178,7 +2277,7 @@ void XCFImageFormat::mergeGrayToGray(Layer &layer, uint i, uint j, int k, int l,
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::mergeGrayAToGray(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::mergeGrayAToGray(const Layer &layer, uint i, uint j, int k, int l,
                                      QImage &image, int m, int n)
 {
    int src = qGray(layer.image_tiles[j][i].pixel(k, l));
@ -2294,7 +2393,7 @@ void XCFImageFormat::mergeGrayAToGray(Layer &layer, uint i, uint j, int k, int l

    uchar new_a = OPAQUE_OPACITY;

-    float src_ratio = (float)src_a / new_a;
+    const float src_ratio = new_a == 0 ? 1.0 : (float)src_a / new_a;
    float dst_ratio = 1.0 - src_ratio;

    uchar new_g = (uchar)(src_ratio * src + dst_ratio * dst + EPSILON);
@ -2315,7 +2414,7 @@ void XCFImageFormat::mergeGrayAToGray(Layer &layer, uint i, uint j, int k, int l
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::mergeGrayToRGB(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::mergeGrayToRGB(const Layer &layer, uint i, uint j, int k, int l,
                                    QImage &image, int m, int n)
 {
    QRgb src = layer.image_tiles[j][i].pixel(k, l);
@ -2336,7 +2435,7 @@ void XCFImageFormat::mergeGrayToRGB(Layer &layer, uint i, uint j, int k, int l,
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::mergeGrayAToRGB(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::mergeGrayAToRGB(const Layer &layer, uint i, uint j, int k, int l,
                                     QImage &image, int m, int n)
 {
    int src = qGray(layer.image_tiles[j][i].pixel(k, l));
@ -2467,7 +2566,7 @@ void XCFImageFormat::mergeGrayAToRGB(Layer &layer, uint i, uint j, int k, int l,

    uchar new_a = dst_a + INT_MULT(OPAQUE_OPACITY - dst_a, src_a);

-    float src_ratio = (float)src_a / new_a;
+    const float src_ratio = new_a == 0 ? 1.0 : (float)src_a / new_a;
    float dst_ratio = 1.0 - src_ratio;

    uchar new_g = (uchar)(src_ratio * src + dst_ratio * dst + EPSILON);
@ -2490,7 +2589,7 @@ void XCFImageFormat::mergeGrayAToRGB(Layer &layer, uint i, uint j, int k, int l,
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::mergeIndexedToIndexed(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::mergeIndexedToIndexed(const Layer &layer, uint i, uint j, int k, int l,
        QImage &image, int m, int n)
 {
    int src = layer.image_tiles[j][i].pixelIndex(k, l);
@ -2508,7 +2607,7 @@ void XCFImageFormat::mergeIndexedToIndexed(Layer &layer, uint i, uint j, int k,
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::mergeIndexedAToIndexed(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::mergeIndexedAToIndexed(const Layer &layer, uint i, uint j, int k, int l,
        QImage &image, int m, int n)
 {
    uchar src = layer.image_tiles[j][i].pixelIndex(k, l);
@ -2540,7 +2639,7 @@ void XCFImageFormat::mergeIndexedAToIndexed(Layer &layer, uint i, uint j, int k,
 * \param m x pixel of destination image.
 * \param n y pixel of destination image.
 */
-void XCFImageFormat::mergeIndexedAToRGB(Layer &layer, uint i, uint j, int k, int l,
+void XCFImageFormat::mergeIndexedAToRGB(const Layer &layer, uint i, uint j, int k, int l,
                                        QImage &image, int m, int n)
 {
    QRgb src = layer.image_tiles[j][i].pixel(k, l);
--- a/src/imageformats/xcf_p.h
+++ b/src/imageformats/xcf_p.h
@ -19,8 +19,8 @@
 *
 */

-#ifndef KIMG_XCF_H
-#define KIMG_XCF_H
+#ifndef KIMG_XCF_P_H
+#define KIMG_XCF_P_H

 #include <QImageIOPlugin>

@ -29,9 +29,9 @@ class XCFHandler : public QImageIOHandler
 public:
    XCFHandler();

-    bool canRead() const Q_DECL_OVERRIDE;
-    bool read(QImage *image) Q_DECL_OVERRIDE;
-    bool write(const QImage &image) Q_DECL_OVERRIDE;
+    bool canRead() const override;
+    bool read(QImage *image) override;
+    bool write(const QImage &image) override;

    static bool canRead(QIODevice *device);
 };
@ -42,8 +42,8 @@ class XCFPlugin : public QImageIOPlugin
    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "xcf.json")

 public:
-    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
-    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const override;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const override;
 };

-#endif // KIMG_XCF_H
+#endif // KIMG_XCF_P_H
--- a/tests/format-enum.h
+++ b/tests/format-enum.h
@ -19,6 +19,9 @@
 * <http://www.gnu.org/licenses/>.
 */

+#ifndef FORMAT_ENUM_H
+#define FORMAT_ENUM_H
+
 #include <QImage>

 // Generated from QImage::Format enum
@ -71,3 +74,4 @@ QString formatToString(QImage::Format format)
        QLatin1String(">");
 }

+#endif
--- a/tests/imageconverter.cpp
+++ b/tests/imageconverter.cpp
@ -64,11 +64,13 @@ int main(int argc, char **argv)
    if (parser.isSet(listformats)) {
        QTextStream out(stdout);
        out << "Input formats:\n";
-        foreach (const QByteArray &fmt, QImageReader::supportedImageFormats()) {
+        const auto lstReaderSupportedFormats = QImageReader::supportedImageFormats();
+        for (const QByteArray &fmt : lstReaderSupportedFormats) {
            out << "  " << fmt << '\n';
        }
        out << "Output formats:\n";
-        foreach (const QByteArray &fmt, QImageWriter::supportedImageFormats()) {
+        const auto lstWriterSupportedFormats = QImageWriter::supportedImageFormats();
+        for (const QByteArray &fmt : lstWriterSupportedFormats) {
            out << "  " << fmt << '\n';
        }
        return 0;
--- a/tests/imagedump.cpp
+++ b/tests/imagedump.cpp
@ -72,7 +72,8 @@ int main(int argc, char **argv)
    if (parser.isSet(listformats)) {
        QTextStream out(stdout);
        out << "File formats:\n";
-        foreach (const QByteArray &fmt, QImageReader::supportedImageFormats()) {
+        const auto lstSupportedFormats = QImageReader::supportedImageFormats();
+        for (const auto &fmt : lstSupportedFormats) {
            out << "  " << fmt << '\n';
        }
        return 0;
@ -115,8 +116,8 @@ int main(int argc, char **argv)
        }
        img = img.convertToFormat(qformat);
    }
-    qint64 written = output.write(reinterpret_cast<const char *>(img.bits()), img.byteCount());
-    if (written != img.byteCount()) {
+    qint64 written = output.write(reinterpret_cast<const char *>(img.bits()), img.sizeInBytes());
+    if (written != img.sizeInBytes()) {
        QTextStream(stderr) << "Could not write image data to " << files.at(1)
                            << ":" << output.errorString() << "\n";
        return 5;
Author	SHA1	Message	Date
l10n daemon script	9a9ac6e8fe	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.62.0 release.	2019-09-07 12:35:26 +00:00
Albert Astals Cid	4bf2894bde	Fix uninitialized memory read Summary: Make sure whole of pixel_size in pixel has data either because it was read or because we set it to 0 oss-fuzz/14565 Reviewers: dfaure, apol, vkrause Reviewed By: vkrause Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D23739	2019-09-05 20:05:35 +02:00
l10n daemon script	40353da5db	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.61.0 release.	2019-08-03 19:33:24 +00:00
Friedrich W. H. Kossebau	068e711847	Remove explicit use of ECM_KDE_MODULE_DIR, is part of ECM_MODULE_PATH GIT_SILENT	2019-08-02 22:54:45 +02:00
Boudewijn Rempt	90ba55d982	Remove unused pnm.desktop file	2019-07-20 11:29:31 +02:00
l10n daemon script	e3603bc748	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.60.0 release.	2019-07-06 13:15:48 +00:00
Albert Astals Cid	75ef81a109	QImage::byteCount -> QImage::sizeInByes	2019-07-04 22:26:53 +02:00
Albert Astals Cid	bff22e2a76	GIT_SILENT Upgrade Qt5 version requirement to 5.11.0.	2019-07-04 19:23:58 +02:00
l10n daemon script	0196444a99	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.59.0 release.	2019-06-01 16:38:28 +00:00
l10n daemon script	90f340df24	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.58.0 release.	2019-05-04 22:44:00 +00:00
Albert Astals Cid	1a9b5d6cb6	tga: don't try to read more than max_palette_size into palette	2019-05-01 01:51:42 +02:00
Albert Astals Cid	96b1d7e7bc	tga: memset dst if read fails	2019-05-01 01:51:39 +02:00
Albert Astals Cid	bcce48012e	tga: memset the whole palette array, not only the palette_size	2019-05-01 01:44:47 +02:00
Albert Astals Cid	0db5c89c5f	Initialize the unread bits of _starttab oss-fuzz #14446	2019-04-25 23:08:17 +02:00
Albert Astals Cid	6fea48c4ee	xcf: Fix uninitialized memory use on broken documents oss-fuzz #14312	2019-04-17 20:09:49 +02:00
Albert Astals Cid	645daec1ef	ras: Don't overread input on malformed files	2019-04-17 20:03:52 +02:00
Albert Astals Cid	aaa285a3b9	xcf: layer is const in copy and merge, mark it as such	2019-04-17 17:37:28 +02:00
Albert Astals Cid	35e64c44d8	No & is a bit faster here	2019-04-17 17:37:28 +02:00
Albert Astals Cid	26b796f67d	const & is a bit faster here	2019-04-17 17:37:28 +02:00
Albert Astals Cid	4692a34a1c	QStringLiteral is a bit faster here	2019-04-17 17:37:28 +02:00
l10n daemon script	c0656c5181	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.57.0 release.	2019-04-07 07:18:46 +00:00
Albert Astals Cid	83d1ca90d9	Fix compilation Summary: Seems only gcc can do a constexpr with strlen. This fixes the build with clang, hopefully to with MSVC? Reviewers: svuorela Reviewed By: svuorela Subscribers: svuorela, apol, pino, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D20149	2019-03-31 22:18:16 +02:00
Albert Astals Cid	fd4fb6f596	ora:kra: qstrcmp -> memcmp i..e don't check strings but memory Makes oss-fuzz happier. Reviewers: svuorela Reviewed By: svuorela Subscribers: apol, pino, security-team, rempt, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D20143	2019-03-31 21:32:07 +02:00
Albert Astals Cid	a24ece396a	autotests: Also exercise canRead	2019-03-31 20:58:26 +02:00
Albert Astals Cid	9fc6967f4f	Fix RGBHandler::canRead Summary: As one can see in SGIImage::readImage the accepted images are _stream >> u16; if (u16 != 0x01da) { return false; } _stream >> _rle; if (_rle > 1) { return false; } so not only \x01\xda\x01 but also \x01\xda\x00 Reviewers: svuorela Reviewed By: svuorela Subscribers: svuorela, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D20145	2019-03-31 19:44:21 +02:00
Albert Astals Cid	bd704045e6	xcf: Don't crash with files with unsupported layer modes	2019-03-31 01:35:33 +01:00
Laurent Montel	af7a89fea7	GIT_SILENT: add gitignore	2019-03-04 07:03:36 +01:00
l10n daemon script	5989bba56a	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.56.0 release.	2019-03-02 13:27:12 +00:00
Albert Astals Cid	20100a1e0e	ras: fix crash on broken files Replace QVector::operator[] with QVector::value() since we can't know for sure the values will be on range so use value() that gives us a 0 if the index is not on range oss-fuzz/13462	2019-03-01 23:33:35 +01:00
Laurent Montel	297b168a52	Use auto here too	2019-02-28 23:03:25 +01:00
Laurent Montel	f1c6c15b06	compile without foreach Summary: compile without foreach Reviewers: dfaure, apol Reviewed By: apol Subscribers: apol, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D19317	2019-02-28 23:02:41 +01:00
Albert Astals Cid	156bac5e54	ras: protect the palette QVector too oss-fuzz/13068	2019-02-13 23:50:36 +01:00
Albert Astals Cid	d79c11d280	ras: tweak max file check better to do - 32 than + 32 otherwise we may overflow oss-fuzz/13017	2019-02-11 22:57:33 +01:00
Albert Astals Cid	aeec934839	xcf: Fix uninitialized memory use on broken documents oss-fuzz/12871	2019-02-08 23:27:03 +01:00
Albert Astals Cid	0c4f2f8e62	add const, helps understand the function better	2019-02-08 23:07:56 +01:00
Albert Astals Cid	4a8da73f0e	ras: tweak max size that "fits" in a QVector oss-fuzz/12951	2019-02-07 22:14:22 +01:00
Albert Astals Cid	039d7d8fbe	ras: don't assert because we try to allicate a huge vector oss-fuzz/12915	2019-02-06 22:06:58 +01:00
Albert Astals Cid	b072484dbb	ras: Protect against divide by zero oss-fuzz/12905	2019-02-05 19:51:24 +01:00
Albert Astals Cid	bad90cea4b	xcf: Don't divide by 0 oss-fuzz/12815	2019-02-03 14:06:33 +01:00
Albert Astals Cid	a51cbd865f	tga: fail gracefully if readRawData errors oss-fuzz/12818	2019-02-03 13:49:11 +01:00
Albert Astals Cid	1a31500e55	ras: fail gracefully on heightwidthbpp > length oss-fuzz/12822	2019-02-03 13:38:44 +01:00
l10n daemon script	dd95a5bd0e	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.55.0 release.	2019-02-02 17:22:00 +00:00
Albert Astals Cid	8d0b625538	xcf: Fix fix for opacity being out of bounds If max opacity is 255 we want the min between opacity and 255 and not the max	2019-02-01 11:30:28 +01:00
Albert Astals Cid	8e48d67568	Uncomment the qdebug includes i've wasted enough time uncommenting and commenting them again	2019-01-31 01:37:09 +01:00
Albert Astals Cid	8b8330b0fe	tga: Fix Use-of-uninitialized-value on broken files oss-fuzz/12776	2019-01-31 01:35:39 +01:00
Albert Astals Cid	e7f3c0be44	max opacity is 255 Fixes oss-fuzz/12782	2019-01-31 01:25:38 +01:00
Albert Astals Cid	c3152506e2	xcf: Fix assert in files with two PROP_COLORMAP It's most probably a broken file but better if we don't assert ^_^ oss-fuzz/12780	2019-01-31 01:19:52 +01:00
Albert Astals Cid	de7a9a8457	ras: Fix assert because of ColorMapLength being too big oss-fuzz/12785	2019-01-31 01:03:17 +01:00
Albert Astals Cid	c2d2a9be66	pcx: Fix crash on fuzzed file oss-fuzz/12784	2019-01-31 00:56:25 +01:00
Albert Astals Cid	4ee92527c4	xcf: Implement robustness for when PROP_APPLY_MASK is not on the file fixes oss-fuzz/12754	2019-01-29 22:34:04 +01:00
Albert Astals Cid	1bad780baa	xcf: loadHierarchy: Obey the layer.type and not the bpp Otherwise we end up doing uninitialized memory reads on broken/fuzzed files oss-fuzz/12761	2019-01-29 20:36:15 +01:00
Albert Astals Cid	18e17d3a7a	tga: Don't support more than 8 alpha bits Fixes undefined left shift with negative values oss-fuzz/12764	2019-01-29 12:39:52 +01:00
Albert Astals Cid	e34f53d6ae	ras: Return false if allocating the image failed Probably because it's too huge	2019-01-29 12:32:23 +01:00
Albert Astals Cid	6dcea7fd01	rgb: Fix integer overflow in fuzzed file oss-fuzz/12763	2019-01-29 11:19:58 +01:00
Albert Astals Cid	4751e897ce	rgb: Fix Heap-buffer-overflow in fuzzed file oss-fuzz/12757	2019-01-29 10:54:25 +01:00
Albert Astals Cid	ac725cca68	psd: Fix crash on fuzzed file oss-fuzz/12752	2019-01-29 10:53:30 +01:00
Albert Astals Cid	f61d64e0e5	xcf: Initialize x/y_offset https://gitlab.gnome.org/GNOME/gimp/raw/master/devel-docs/xcf.txt When reading old XCF files that lack this property, assume (0,0).	2019-01-28 21:51:10 +01:00
Albert Astals Cid	e45b65e814	rgb: Fix crash in fuzzed image An image without color channels makes no sense	2019-01-28 21:48:26 +01:00
Albert Astals Cid	7e86e62e86	pcx: Fix crash on fuzzed image	2019-01-28 21:40:42 +01:00
Albert Astals Cid	03c3c07004	Fix tests on jenkins Qt also has a tga image plugin so unless we make sure ours is used first tests are not testing what they should On a side note their plugin fails our tests so someone with enough time should report the failures to them	2019-01-28 21:27:22 +01:00
Albert Astals Cid	0e21713267	rgb: fix crash in fuzzed file	2019-01-28 21:10:18 +01:00
Albert Astals Cid	188271a5d0	xcf: initialize layer mode https://gitlab.gnome.org/GNOME/gimp/raw/master/devel-docs/xcf.txt When reading old XCF files that lack this property, assume mode==0.	2019-01-28 21:05:29 +01:00
Albert Astals Cid	311296dd19	xcf: initialize layer opacity https://gitlab.gnome.org/GNOME/gimp/raw/master/devel-docs/xcf.txt When reading old XCF files that lack this property, full opacity should be assumed.	2019-01-28 20:31:18 +01:00
Albert Astals Cid	d6ae11a691	xcf: set buffer to 0 if read less data that expected Fixes MemorySanitizer: use-of-uninitialized-value on fuzzed file	2019-01-28 20:09:21 +01:00
Albert Astals Cid	3923c9b855	bzero -> memset Seems bzero is less portable	2019-01-28 19:18:01 +01:00
Fabian Vogt	51d710adda	Fix various OOB reads and writes in kimg_tga and kimg_xcf Summary: I had a look at some image loading code in kimageformats and found memory corruption bugs (there might be more): - oobwrite4b.xcf: OOB write in kimg_xcf: By overflowing the "size = 3 * ncolors + 4;" calculation, it's possible to make size == 3 or size == 0, which then allows 1 or 4 bytes to be overwritten: https://cgit.kde.org/kimageformats.git/tree/src/imageformats/xcf.cpp?id=3f2552f21b1cdef063c2a93cc95d42a8cf907fcf#n484 The values aren't arbitrary, so AFAICT DoS only. Fix is to move the sanity check for size below the assignment. - oobread.tga: OOB read in kimg_tga: By overflowing the "size = tga.width * tga.height * pixel_size" calculation, it's possible to cause OOB reads later on as the image data array is too small: https://cgit.kde.org/kimageformats.git/tree/src/imageformats/tga.cpp?id=3f2552f21b1cdef063c2a93cc95d42a8cf907fcf#n192 Fix is to use a 64bit integer instead. - oobwrite4b.tga/oobwrite507.tga: OOB write in kimg_tga If RLE is enabled, any size checks are skipped, so it's possible to write either 128 repetitions of an arbitrary four byte value (oobwrite4b.tga) or or 507 arbitrary bytes (oobwrite507.tga) out of bounds. https://cgit.kde.org/kimageformats.git/tree/src/imageformats/tga.cpp?id=3f2552f21b1cdef063c2a93cc95d42a8cf907fcf#n209 Fix is to check for "num" being negative before reading into the buffer. Also, bail out early if there is no more data available (reading a 65kx65k px image from 14B data takes ages otherwise) Test Plan: Stopped crashing and valgrind don't complain anymore. TGA preview still works for valid files. Reviewers: aacid Reviewed By: aacid Subscribers: lbeltrame, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D18574	2019-01-28 14:21:27 +01:00
Albert Astals Cid	52a5959c08	pic: resize header id back if didn't read 4 bytes as expected	2019-01-28 01:56:12 +01:00
Albert Astals Cid	309cddbe83	xcf: bzero buffer if read less data than expected	2019-01-28 01:30:17 +01:00
Albert Astals Cid	47f46d4463	xcf: Only call setDotsPerMeterX/Y if PROP_RESOLUTION is found https://gitlab.gnome.org/GNOME/gimp/blob/master/devel-docs/xcf.txt says it's not really that important to be there	2019-01-27 13:14:30 +01:00
Albert Astals Cid	bff6142b44	xcf: initialize num_colors	2019-01-27 13:07:37 +01:00
Albert Astals Cid	09abfd8084	xcf: Initialize layer visible property https://gitlab.gnome.org/GNOME/gimp/blob/master/devel-docs/xcf.txt says When reading old XCF files that lack this property, assume that layers are visible	2019-01-27 13:03:51 +01:00
Albert Astals Cid	964624ba40	xcf: Don't cast int to enum that can't hold that int value	2019-01-27 12:50:19 +01:00
Albert Astals Cid	3dee6f7c47	xcf: Do not overflow int on the setDotsPerMeterX/Y call	2019-01-27 12:29:07 +01:00
Albert Astals Cid	b8cb5e322c	delete copy constructor and assignment operator of some internal classes they are unused, but if anyone would use them things would go wrong, so protect us from it	2019-01-13 22:30:55 +01:00
Albert Astals Cid	8803ae9cd6	GIT_SILENT Upgrade Qt5 version requirement to 5.10.0.	2019-01-07 00:19:26 +01:00
l10n daemon script	e5b7b414df	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.54.0 release.	2019-01-04 21:42:58 +00:00
Albert Astals Cid	c3b8030674	GIT_SILENT Upgrade CMake version requirement to 3.5.	2018-12-01 23:56:44 +01:00
l10n daemon script	072b531b0d	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.53.0 release.	2018-12-01 14:40:14 +00:00
Albert Astals Cid	10f201e414	Use gimp to export simple-rgba-gimp-2.8.10.xcf to png again This fixes the xcf test that was failing, i guess at some point someone run optipng or something over the expected result and that was causing the test to fail	2018-11-17 12:22:25 +01:00
Albert Astals Cid	1656913fbd	GIT_SILENT Upgrade Qt5 version requirement to 5.9.0.	2018-11-17 11:18:21 +01:00
l10n daemon script	beaf20bd4a	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.52.0 release.	2018-11-03 12:00:43 +00:00
Yuri Chornoivan	8ac949d459	Fix minor EBN issues	2018-10-22 19:58:24 +03:00
l10n daemon script	4c0c6c8d60	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.51.0 release.	2018-10-07 10:07:12 +00:00
David Faure	f485719012	kimg_rgb: optimize away QRegExp and QString::fromLocal8Bit. Summary: The code is even simpler this way. Found by using heaptrack. Test Plan: the unittest for rgb still passes. Reviewers: cfeck Reviewed By: cfeck Subscribers: jtamate, kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D15890	2018-10-03 00:51:29 +02:00
Friedrich W. H. Kossebau	1db1b94657	[EPS] qWarning -> qCWarning	2018-09-17 11:56:58 +02:00
Friedrich W. H. Kossebau	98c65a438d	[EPS] Fix crash at app shutdown (being tried to persist clipboard image) Summary: Deny any capabilities when there is no QApp instance. BUG: 397040 Test Plan: Untested, as I do not experience the bug on my system and had no time to invest into trying to. Reviewers: zccrs, dfaure, pino Reviewed By: dfaure Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D15405	2018-09-17 11:54:18 +02:00
l10n daemon script	167967a145	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.50.0 release.	2018-08-31 22:22:12 +00:00
l10n daemon script	17239a7ea6	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.49.0 release.	2018-08-04 08:43:39 +00:00
l10n daemon script	118d262bec	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.48.0 release.	2018-07-07 21:52:47 +00:00
Laurent Montel	67a84f459d	Use override	2018-06-12 07:01:11 +02:00
l10n daemon script	de2b942b33	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.47.0 release.	2018-06-02 16:28:21 +00:00
Alexander Volkov	813a7bdddb	Remove duplicated mime types from json files Qt expects a bijection between keys and mime types.	2018-05-25 14:32:11 +03:00
Laurent Montel	a4d1f4db1d	Use override	2018-05-23 08:06:50 +02:00
l10n daemon script	29d090f078	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.46.0 release.	2018-05-05 12:39:09 +00:00
Christoph Feck	19f33239e7	[XCF/GIMP loader] Raise maximimum allowed image size to 32767x32767 on 64 bit platforms The GIMP image loader had a limit to 16K x 16K pixels, because this would already exhaust the 2 GByte address space limit of 32 bit systems. Remove this limit on 64 bit systems to allow the full 32K x 32K size. BUG: 391970 Differential Revision: https://phabricator.kde.org/D12557	2018-05-02 02:10:26 +02:00
l10n daemon script	4668fbbcdc	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.45.0 release.	2018-04-07 07:47:44 +00:00
Laurent Montel	698ba297d3	We depend against 5.8.0 now	2018-03-27 08:01:04 +02:00
l10n daemon script	3a9bafdbbe	GIT_SILENT Upgrade Qt5 version requirement to 5.8.0.	2018-03-24 13:34:11 +00:00
Laurent Montel	e5b226e804	Remove not necessary QtCore and co	2018-03-11 13:49:26 +01:00
l10n daemon script	871d0f976f	GIT_SILENT Upgrade ECM and KF5 version requirements for 5.44.0 release.	2018-03-03 09:52:42 +00:00
Friedrich W. H. Kossebau	7aa5333a3f	kcoreaddons_add_plugin: remove effectless OBJECT_DEPENDS on json file The JSON file argument is passed to Q_PLUGIN_METADATA, which is a no-code macro at the C++ level and only used to note information used by moc for the generated moc file. So when the content of the JSON file has changed, this will not change anything in the preprocessed source file itself. It only has an effect on the content of the moc file generated based on it, which is either included and thus already triggers a dependecy or generated by automoc and compiled separately into the target with the needed dependencies. It is automoc which needs to properly trigger a recreation of the moc file when checking the sources (and at least in 3.9 & 10 does), and this is nothing that can be influenced by dependency rules.	2018-02-23 19:09:18 +01:00