handle nil thread handler

Author: alexandre-daubois

debugstate.go

@@ -65,9 +65,17 @@ func threadDebugState(thread *phpThread) ThreadDebugState {
 	}
 
 	thread.handlerMu.RLock()
-	defer thread.handlerMu.RUnlock()
+	handler := thread.handler
+	thread.handlerMu.RUnlock()
 
-	fc := thread.handler.frankenPHPContext()
+	if handler == nil {
+		return s
+	}
+
+	thread.contextMu.RLock()
+	defer thread.contextMu.RUnlock()
+
+	fc := handler.frankenPHPContext()
 	if fc == nil || fc.request == nil || fc.responseWriter == nil {
 		return s
 	}

phpthread.go

@@ -22,6 +22,7 @@ type phpThread struct {
 	drainChan    chan struct{}
 	handlerMu    sync.RWMutex
 	handler      threadHandler
+	contextMu    sync.RWMutex
 	state        *state.ThreadState
 	requestCount atomic.Int64
 }
@@ -127,10 +128,13 @@ func (thread *phpThread) context() context.Context {
 
 func (thread *phpThread) name() string {
 	thread.handlerMu.RLock()
-	name := thread.handler.name()
-	thread.handlerMu.RUnlock()
+	defer thread.handlerMu.RUnlock()
 
-	return name
+	if thread.handler == nil {
+		return "unknown"
+	}
+
+	return thread.handler.name()
 }
 
 // Pin a string that is not null-terminated

threadregular.go

@@ -89,8 +89,10 @@ func (handler *regularThread) waitForRequest() string {
 	case ch = <-handler.thread.requestChan:
 	}
 
+	handler.thread.contextMu.Lock()
 	handler.ctx = ch.ctx
 	handler.contextHolder.frankenPHPContext = ch.frankenPHPContext
+	handler.thread.contextMu.Unlock()
 	handler.state.MarkAsWaiting(false)
 
 	// set the scriptFilename that should be executed
@@ -99,8 +101,10 @@ func (handler *regularThread) waitForRequest() string {
 
 func (handler *regularThread) afterRequest() {
 	handler.contextHolder.frankenPHPContext.closeContext()
+	handler.thread.contextMu.Lock()
 	handler.contextHolder.frankenPHPContext = nil
 	handler.ctx = nil
+	handler.thread.contextMu.Unlock()
 }
 
 func handleRequestWithRegularPHPThreads(ch contextHolder) error {

threadworker.go

@@ -131,8 +131,10 @@ func tearDownWorkerScript(handler *workerThread, exitStatus int) {
 	// make sure to close the worker request context
 	if handler.workerFrankenPHPContext != nil {
 		handler.workerFrankenPHPContext.closeContext()
+		handler.thread.contextMu.Lock()
 		handler.workerFrankenPHPContext = nil
 		handler.workerContext = nil
+		handler.thread.contextMu.Unlock()
 	}
 
 	// on exit status 0 we just run the worker script again
@@ -235,8 +237,10 @@ func (handler *workerThread) waitForWorkerRequest() (bool, any) {
 	case requestCH = <-handler.worker.requestChan:
 	}
 
+	handler.thread.contextMu.Lock()
 	handler.workerContext = requestCH.ctx
 	handler.workerFrankenPHPContext = requestCH.frankenPHPContext
+	handler.thread.contextMu.Unlock()
 	handler.state.MarkAsWaiting(false)
 
 	if globalLogger.Enabled(requestCH.ctx, slog.LevelDebug) {
@@ -295,8 +299,10 @@ func go_frankenphp_finish_worker_request(threadIndex C.uintptr_t, retval *C.zval
 	thread.requestCount.Add(1)
 
 	fc.closeContext()
+	thread.contextMu.Lock()
 	thread.handler.(*workerThread).workerFrankenPHPContext = nil
 	thread.handler.(*workerThread).workerContext = nil
+	thread.contextMu.Unlock()
 
 	if globalLogger.Enabled(ctx, slog.LevelDebug) {
 		if fc.request == nil {