diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-10-01 16:21:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-01 16:21:12 +0200 |
| commit | 8ee9774e67edf57d891528749a360a0af8f0c6f7 (patch) | |
| tree | e0b7d4b19c26c48fe41e930532f2037f8dc43204 /src/gui/painting/qregion.cpp | |
| parent | d78fb442d750b33afe2e41f31588ec94cf4023ad (diff) | |
| parent | 8ab25620d3df25c43011ae982f4614639578afb3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/gui/painting/qregion.cpp')
| -rw-r--r-- | src/gui/painting/qregion.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index b21c77f745..6bf5f6bf88 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -3558,8 +3558,10 @@ static QRegionPrivate *PolygonRegion(const QPoint *Pts, int Count, int rule) return region; } - if (!(pETEs = static_cast<EdgeTableEntry *>(malloc(sizeof(EdgeTableEntry) * Count)))) + if (!(pETEs = static_cast<EdgeTableEntry *>(malloc(sizeof(EdgeTableEntry) * Count)))) { + delete region; return 0; + } region->vectorize(); |