diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2016-07-07 15:23:20 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2016-07-08 05:19:32 +0000 |
| commit | deb2728a8677b275613668d1467b636ed1776282 (patch) | |
| tree | 503adbf41f60ba128ac591451edbb1c308efd370 /src/plugins/platforms/cocoa/qcocoaintegration.mm | |
| parent | 14c6f80f4b2d8275037ed1fc3c63870e7f21570a (diff) | |
[macOS] Check that the screen's index is still valid after updating
It is possible for a screen to be disconnected while it is doing an
update of the available screens. Therefore before returning the pointer
to the screen then it should be rechecked that the index is still within
the range of available screens.
Change-Id: Iaa08070e79a72cb309d8a24cea786a5dccf6b719
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 933160b2ca..659c803a19 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -450,6 +450,10 @@ QCocoaScreen *QCocoaIntegration::screenAtIndex(int index) if (index >= mScreens.count()) updateScreens(); + // It is possible that the screen got removed while updateScreens was called + // so we do a sanity check to be certain + if (index >= mScreens.count()) + return 0; return mScreens.at(index); } |