Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits)
  Fix compilation of QMutableSetIterator::value() with QT_STRICT_ITERATORS
  Fix the compilation error that the previous fix didn't fix
  Use the thread-default glib context for the DBus connection in the ICD bearer manager.
  Check that _POSIX_THREAD_SAFE_FUNCTIONS is larger than zero.
  Use an increasing size for the getpwuid_r buffer.
  Make sure we use at least 1024 bytes when calling getpwuid_r.
  Fix compilation error: symbol is namespaced.
  Don't crash when creating backtrace for built-in JS function (2nd try)
  Revert "Improved performance of mapFromGlobal/mapToGlobal on X11"
  QtDBus: do not wait for reply for AddMatch and RemoveMatch
  Make qdbus show all types, even those that it doesn't know about
  Doc: Fix the docs saying what the locale codec is used for
  Autotest: simple improvements
  Autotest: Use QElapsedTimer for timings
  directfb: Pixmap creation always premultiplied the alpha even when it is already premultiplied in the image.
  Don't crash when BMP color table is broken
  Designer: Fix a crash in the Signal-Slot-Editor.
  complain about unmatched quotes/parens
  use const ref
  move multiple inclusion check for feature files to correct location
  ...

1 files changed, 2 insertions, 0 deletions

diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
index 09c086a..6dea9d9 100644
--- a/src/gui/image/qbmphandler.cpp
+++ b/src/gui/image/qbmphandler.cpp
@@ -246,6 +246,8 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
 
     if (depth != 32) {
         ncols = bi.biClrUsed ? bi.biClrUsed : 1 << nbits;
+        if (ncols > 256) // sanity check - don't run out of mem if color table is broken
+            return false;
         image.setColorCount(ncols);
     }