fix: Potential hang fix during stream reading

btfuse · Jul 17, 2024 · 7a2a24e · 7a2a24e
1 parent 182583e
commit 7a2a24e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/BTFuse/src/BTFuseStreamReader.m b/BTFuse/src/BTFuseStreamReader.m
@@ -43,21 +43,22 @@ - (void) stream:(NSStream*) stream handleEvent:(NSStreamEvent) event {
     }
 
     switch (event) {
-        case NSStreamEventOpenCompleted: break;
         case NSStreamEventHasBytesAvailable:
+        case NSStreamEventEndEncountered:
             dispatch_semaphore_signal($readSemaphore);
             break;
         case NSStreamEventErrorOccurred:
             NSLog(@"Stream encountered an error: %@", [stream streamError].localizedDescription);
             $error = [stream streamError];
+            dispatch_semaphore_signal($readSemaphore);
             break;
-        case NSStreamEventEndEncountered:
+        case NSStreamEventOpenCompleted:
         default: break;
     }
 }
 
 - (int64_t) read:(uint8_t*) buffer maxBytes:(uint32_t) max {
-    if (!$stream.hasBytesAvailable) {
+    if (!$stream.hasBytesAvailable && $stream.streamStatus != NSStreamEventEndEncountered) {
         dispatch_semaphore_wait($readSemaphore, DISPATCH_TIME_FOREVER);
     }