Changeset 10569

Timestamp:

May 1, 2010, 3:50:48 AM (11 years ago)

Author:

charles

Message:

(1.9x daemon) backported r10504 for #3158 "posible crash when using inotify for the daemon's watchdir"

File:

• branches/1.9x/daemon/watch.c (modified) (2 diffs)

branches/1.9x/daemon/watch.c

@@ -75 +75 @@
     DIR * odir;
     w->inotify_fd = inotify_init( );
-    tr_inf( "Using inotify to watch directory \"%s\"", w->dir );
-    i = inotify_add_watch( w->inotify_fd, w->dir, DTR_INOTIFY_MASK );
+
+    if( w->inotify_fd < 0 )
+    {
+        i = -1;
+    }
+    else
+    {
+        tr_inf( "Using inotify to watch directory \"%s\"", w->dir );
+        i = inotify_add_watch( w->inotify_fd, w->dir, DTR_INOTIFY_MASK );
+    }
 
     if( i < 0 )
     {
-        tr_err( "Unable to watch \"%s\": %s", w->dir, strerror (errno) );
+        tr_err( "Unable to watch \"%s\": %s", w->dir, strerror( errno ) );
     }
     else if(( odir = opendir( w->dir )))
@@ -106 +114 @@
 watchdir_free_impl( dtr_watchdir * w )
 {
-    inotify_rm_watch( w->inotify_fd, DTR_INOTIFY_MASK );
-    close( w->inotify_fd );
+    if( w->inotify_fd >= 0 )
+    {
+        inotify_rm_watch( w->inotify_fd, DTR_INOTIFY_MASK );
+
+        close( w->inotify_fd );
+    }
 }
 static void