diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-28 12:16:17 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-28 12:16:17 +0000 |
| commit | 4e1463c20aa6ec52f23e1e5f6426b68edb2255f0 (patch) | |
| tree | df3d8f65f0c8df1990c48931c4c0b5063ff6f8c6 /src/qml/parser/qqmljsmemorypool_p.h | |
| parent | ea9d6955f4c1c1141d0909ddb32abb59c032ac3c (diff) | |
| parent | 9044800083ccffe4d0b732f8b3b60512f32d8f8a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/qml/parser/qqmljsmemorypool_p.h')
| -rw-r--r-- | src/qml/parser/qqmljsmemorypool_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/parser/qqmljsmemorypool_p.h b/src/qml/parser/qqmljsmemorypool_p.h index 08609e2961..536f5d4239 100644 --- a/src/qml/parser/qqmljsmemorypool_p.h +++ b/src/qml/parser/qqmljsmemorypool_p.h @@ -122,6 +122,7 @@ private: _allocatedBlocks *= 2; _blocks = (char **) realloc(_blocks, sizeof(char *) * _allocatedBlocks); + Q_CHECK_PTR(_blocks); for (int index = _blockCount; index < _allocatedBlocks; ++index) _blocks[index] = 0; @@ -129,8 +130,10 @@ private: char *&block = _blocks[_blockCount]; - if (! block) + if (! block) { block = (char *) malloc(BLOCK_SIZE); + Q_CHECK_PTR(block); + } _ptr = block; _end = _ptr + BLOCK_SIZE; |