Update the file descriptor valid checker

Change-Id: Id1b19cfc353135cb6da7cbdd38df02b8af03dbc9

diff --git a/core/src/muse_core.c b/core/src/muse_core.c
index 6eaa0ebe86a6de011c76859d6757e393a917a491..68f1319a272878a489337b90d9769649a16e8ec9 100644 (file)
--- a/core/src/muse_core.c
+++ b/core/src/muse_core.c
@@ -364,8 +364,24 @@ int muse_core_set_socket_timeout(int sock_fd, int timeout_sec)
 
 bool muse_core_fd_is_valid(int fd)
 {
+       int err = 0;
+
+       if (fcntl(fd, F_GETFL) == -1) {
+               err = errno;
+               LOGE("fcntl(F_GETFL) failed on [fd %d, errno %d]", fd, err);
+
+               if (err == EBADF)
+                       return false;
+       }
+
+       if (fd <= STDERR_FILENO) {
+               LOGE("fd %d is invalid", fd);
+               return false;
+       }
+
        muse_core_update_fd_state(fd);
-       return (fcntl(fd, F_GETFL) != MUSE_ERR || errno != EBADF) && (fd > STDERR_FILENO);
+
+       return true;
 }
 
 void muse_core_fd_close(int fd)

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 14d1947e49a97268edbc1170803c27c4d75d92c1..5bbfad30ebdaf4a057d162d50123ed480530aed1 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.4.11
+Version:    0.4.12
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0