Merge remote-tracking branch 'origin/3.1'

Conflicts: src/shared/qbs Change-Id: Ie56c48d3bcd42e1a15832c5e7a10fe69c5410d90
2014-06-02 12:22:03 +02:00
parent 954c61ff58 0f05aa42da
commit 37ab6e6d03
4 changed files with 19 additions and 9 deletions
@@ -983,7 +983,9 @@ class DumperBase:

            data, size, alloc = self.byteArrayDataHelper(objectName)

-            if size == 0:
+            # Object names are short, and GDB can crash on to big chunks.
+            # Since this here is a convenience feature only, limit it.
+            if size <= 0 or size > 80:
                return False

            raw = self.readMemory(data, 2 * size)