BUG: Free notifier after request handling (#6824)

* BUG: Free notifier after request handling If the request included `processEvents()` or otherwise triggered the event loop the notifier could be freed before the slot was finished, causing memory corruption. Fixes #6823 * ENH: Remove unneeded code in WebServer As discussed in issue #6823, the code that explicily freed instance variables wasn't really needed. Removing the corresponding code and a few other unused instance variables makes the code cleaner.
Slicer · Feb 21, 2023 · 3345f6d · 3345f6d
1 parent 9b45f4d
commit 3345f6d
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/Modules/Scripted/WebServer/WebServer.py b/Modules/Scripted/WebServer/WebServer.py
@@ -294,8 +294,6 @@ def __init__(self, server_address=("", 2016), requestHandlers=None, docroot='.',
         self.socket.settimeout(5.)
         if logMessage:
             self.logMessage = logMessage
-        self.notifiers = {}
-        self.connections = {}
         self.requestCommunicators = {}
         self.enableCORS = enableCORS
 
@@ -334,10 +332,6 @@ def registerRequestHandler(self, handler):
             self.requestHandlers.append(handler)
             handler.logMessage = self.logMessage
 
-        def onReadableComplete(self):
-            self.logMessage("reading complete, freeing notifier")
-            self.readNotifier = None
-
         def onReadable(self, fileno):
             self.logMessage('Reading...')
             requestHeader = b""
@@ -383,7 +377,6 @@ def onReadable(self, fileno):
                 self.logMessage('Got complete message of header size %d, body size %d' % (len(requestHeader), len(requestBody)))
                 self.readNotifier.disconnect('activated(int)', self.onReadable)
                 self.readNotifier.setEnabled(False)
-                qt.QTimer.singleShot(0, self.onReadableComplete)
 
                 if len(self.requestSoFar) == 0:
                     self.logMessage("Ignoring empty request")
@@ -462,11 +455,6 @@ def onReadable(self, fileno):
                 self.writeNotifier = qt.QSocketNotifier(fileno, qt.QSocketNotifier.Write)
                 self.writeNotifier.connect('activated(int)', self.onWritable)
 
-        def onWriteableComplete(self):
-            self.logMessage("writing complete, freeing notifier")
-            self.writeNotifier = None
-            self.connectionSocket = None
-
         def onWritable(self, fileno):
             self.logMessage('Sending on %d...' % (fileno))
             sendError = False
@@ -482,7 +470,6 @@ def onWritable(self, fileno):
             if self.sentSoFar >= self.toSend or sendError:
                 self.writeNotifier.disconnect('activated(int)', self.onWritable)
                 self.writeNotifier.setEnabled(False)
-                qt.QTimer.singleShot(0, self.onWriteableComplete)
                 self.connectionSocket.close()
                 self.logMessage('closed fileno %d' % (fileno))