Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T75546: Solve possible endless loop in wintab initialisation

Browse Source 
Some Wintab drivers report a zero length queue, this causes an unplanned never ending loop.

Differential Revision: https://developer.blender.org/D7392
Reviewed by: Ray Molenkamp
This commit is contained in:
Nicholas Rishel
2020-04-09 16:43:09 -06:00
committed by Ray Molenkamp
parent 5ebbd8f672
commit 1a3928f33c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/ghost/intern/GHOST_WindowWin32.cpp
View File

@@ -1072,11 +1072,10 @@ void GHOST_WindowWin32::initializeWintab()
// Wintab provides no way to determine the maximum queue size aside from checking if attempts // Wintab provides no way to determine the maximum queue size aside from checking if attempts
// to change the queue size are successful. // to change the queue size are successful.
const int maxQueue = 500; const int maxQueue = 500;
int initialQueueSize = m_wintab.queueSizeGet(m_wintab.context); int queueSize = m_wintab.queueSizeGet(m_wintab.context);
int queueSize = initialQueueSize;
while (queueSize < maxQueue) { while (queueSize < maxQueue) {
int testSize = min(queueSize + initialQueueSize, maxQueue); int testSize = min(queueSize + 16, maxQueue);
if (m_wintab.queueSizeSet(m_wintab.context, testSize)) { if (m_wintab.queueSizeSet(m_wintab.context, testSize)) {
queueSize = testSize; queueSize = testSize;
} }