Fix improper errno handling

[Version] 0.12.33
[Issue Type] Bug

Change-Id: If13ea55bbce212bf96581a66b9e464019e7b8819

diff --git a/focus_server/mm_sound_mgr_focus_socket.c b/focus_server/mm_sound_mgr_focus_socket.c
index 16a15ff1ec21c172c171a105bd2ed6504b72bfed..3532235c16a7eef58b4207e7775873815f17e589 100644 (file)
--- a/focus_server/mm_sound_mgr_focus_socket.c
+++ b/focus_server/mm_sound_mgr_focus_socket.c
@@ -430,9 +430,10 @@ int MMSoundMgrFocusSocketInit(int *fd)
        strncpy(addr_un.sun_path, FOCUS_SERVER_SOCK, sizeof(addr_un.sun_path));
 
        if (bind(socket_fd, (struct sockaddr *)&addr_un, sizeof(addr_un))) {
-               strerror_r(errno, str_error, sizeof(str_error));
+               int errsv = errno;
+               strerror_r(errsv, str_error, sizeof(str_error));
                debug_error("failed to bind(), err: %s", str_error);
-               if (errno == EADDRINUSE) {
+               if (errsv == EADDRINUSE) {
                        unlink(FOCUS_SERVER_SOCK);
                        debug_msg("unlink socket and bind again...");
                        if (bind(socket_fd, (struct sockaddr *)&addr_un, sizeof(addr_un))) {

diff --git a/mm_sound_bootsound.c b/mm_sound_bootsound.c
index 0924a250f4b11079d671846c24ea3d9e1c43fac8..a505231d2e70a7786d4e7d1967ad7ae1cac10222 100644 (file)
--- a/mm_sound_bootsound.c
+++ b/mm_sound_bootsound.c
@@ -104,9 +104,10 @@ int mm_sound_boot_play_sound(char* path)
        fd = open(path, O_RDONLY);
        if (fd == -1) {
                char str_error[256];
-               strerror_r(errno, str_error, sizeof(str_error));
-               debug_error("file open failed with [%s][%d]", str_error, errno);
-               switch (errno) {
+               int errsv = errno;
+               strerror_r(errsv, str_error, sizeof(str_error));
+               debug_error("file open failed with [%s][%d]", str_error, errsv);
+               switch (errsv) {
                case ENOENT:
                        return MM_ERROR_SOUND_FILE_NOT_FOUND;
                default:

diff --git a/mm_sound_keysound.c b/mm_sound_keysound.c
index dcac05121a9709bdfb0de78cf47652d86524e903..9f42330002e50acf03e17dcf7d77f42af14cd7d9 100644 (file)
--- a/mm_sound_keysound.c
+++ b/mm_sound_keysound.c
@@ -173,9 +173,10 @@ static int _mm_sound_play_keysound(const char *filename, int volume_config, ipc_
                fd = open(filename, O_RDONLY);
                if (fd == -1) {
                        char str_error[256];
-                       strerror_r(errno, str_error, sizeof(str_error));
-                       debug_error("file open failed with [%s][%d]", str_error, errno);
-                       switch (errno) {
+                       int errsv = errno;
+                       strerror_r(errsv, str_error, sizeof(str_error));
+                       debug_error("file open failed with [%s][%d]", str_error, errsv);
+                       switch (errsv) {
                        case ENOENT:
                                return MM_ERROR_SOUND_FILE_NOT_FOUND;
                        default:

diff --git a/packaging/libmm-sound.spec b/packaging/libmm-sound.spec
index 8fe95a32b5f98a853afeea7279aee26b4f9a3298..32e868b95e7579946e5f1fea0160207d1e54b84e 100644 (file)
--- a/packaging/libmm-sound.spec
+++ b/packaging/libmm-sound.spec
@@ -1,6 +1,6 @@
 Name:       libmm-sound
 Summary:    MMSound Package contains client lib and sound_server binary
-Version:    0.12.32
+Version:    0.12.33
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0