Changeset 388

Timestamp:

Feb 9, 2012, 7:54:18 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #285 (NULL pointer dereference on systems without inotify).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_inotify.c (modified) (3 diffs)

trunk/docs/Changelog

@@ -1 @@
-3.0.2:  * fixed: the config file template mentions (in a comment) the
+3.0.2:
+        * fixed a potential NULL pointer dereference in sh_inotify.c on
+          systems where inotify is not available (reported by <anonymous>)
+        * fixed: the config file template mentions (in a comment) the
           non-existent directive SetLockPath instead of the correct
           SetLockfilePath (reported by Curtis).

trunk/src/sh_inotify.c

@@ -862 +862 @@
   retry_msleep(waitsec, 0);
 
-  *errnum = 0;
+  if (errnum)
+    *errnum = 0;
   return -1;
 }
@@ -875 +876 @@
   (void) type;
   (void) rdepth;
-  *errnum = 0;
+
+  if (errnum)
+    *errnum = 0;
   return 0;
 }
@@ -889 +892 @@
   (void) type;
   (void) rdepth;
-  *errnum = 0;
+
+  if (errnum)
+    *errnum = 0;
   return 0;
 }