parent
592c9c6614
commit
0be0cfb237
@ -0,0 +1,23 @@
|
||||
From 99d2101eaa71adc40737ae45cb03d3ae86fdad4a Mon Sep 17 00:00:00 2001
|
||||
From: Cezary Baginski <cezary@chronomantic.net>
|
||||
Date: Fri, 29 Jul 2016 13:26:22 +0200
|
||||
Subject: [PATCH] avoid crashing on Ruby 2.3.1 when fd is closed
|
||||
|
||||
---
|
||||
lib/rb-inotify/notifier.rb | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/lib/rb-inotify/notifier.rb b/lib/rb-inotify/notifier.rb
|
||||
index c2f6ddc..516e78f 100644
|
||||
--- a/lib/rb-inotify/notifier.rb
|
||||
+++ b/lib/rb-inotify/notifier.rb
|
||||
@@ -302,6 +302,9 @@ def readpartial(size)
|
||||
# If the IO has already been closed, reading from it will cause
|
||||
# Errno::EBADF.
|
||||
return nil
|
||||
+ rescue IOError => ex
|
||||
+ return nil if ex.message =~ /stream closed/
|
||||
+ raise
|
||||
end
|
||||
|
||||
tries = 0
|
@ -0,0 +1,22 @@
|
||||
From a3ff7cc8cd7c4e57a4e6d5a885d515946081239f Mon Sep 17 00:00:00 2001
|
||||
From: Cezary Baginski <cezary@chronomantic.net>
|
||||
Date: Tue, 3 May 2016 00:03:50 +0200
|
||||
Subject: [PATCH] Avoid crashing after fd is closed (fix: #41)
|
||||
|
||||
---
|
||||
lib/rb-inotify/event.rb | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/rb-inotify/event.rb b/lib/rb-inotify/event.rb
|
||||
index f6e9551..11701ac 100644
|
||||
--- a/lib/rb-inotify/event.rb
|
||||
+++ b/lib/rb-inotify/event.rb
|
||||
@@ -125,7 +125,7 @@ def initialize(data, notifier)
|
||||
#
|
||||
# @private
|
||||
def callback!
|
||||
- watcher.callback!(self)
|
||||
+ watcher && watcher.callback!(self)
|
||||
end
|
||||
|
||||
# Returns the size of this event object in bytes,
|
Loading…
Reference in new issue