fixup! Fix SVACE defects

[Version] 15.0-2
[Issue Type] Vulnerability

Change-Id: I6f4296902e05800346fa96e9cf59a8f8d293d144

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index 686d94e..9a2946e 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -4,7 +4,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          15.0
-Release:          1
+Release:          2
 Group:            Multimedia/Audio
 License:          LGPL-2.1
 URL:              http://pulseaudio.org

diff --git a/src/pulsecore/sound-file-stream.c b/src/pulsecore/sound-file-stream.c
index 55e0144..22d3c61 100644 (file)
--- a/src/pulsecore/sound-file-stream.c
+++ b/src/pulsecore/sound-file-stream.c
@@ -300,6 +300,9 @@ int pa_play_file(
     pa_zero(sfi);
     if (!(u->sndfile = sf_open_fd(fd, SFM_READ, &sfi, 1))) {
         pa_log("Failed to open file %s", fname);
+#ifdef __TIZEN__
+        fd = -1;
+#endif
         goto fail;
     }
 
@@ -418,6 +421,9 @@ int pa_play_file_repeat(
     pa_zero(sfi);
     if (!(u->sndfile = sf_open_fd(fd, SFM_READ, &sfi, 1))) {
         pa_log("Failed to open file %s", fname);
+#ifdef __TIZEN__
+        fd = -1;
+#endif
         goto fail;
     }
 

diff --git a/src/pulsecore/sound-file.c b/src/pulsecore/sound-file.c
index f678430..be7a2bd 100644 (file)
--- a/src/pulsecore/sound-file.c
+++ b/src/pulsecore/sound-file.c
@@ -75,6 +75,9 @@ int pa_sound_file_load(
     pa_zero(sfi);
     if (!(sf = sf_open_fd(fd, SFM_READ, &sfi, 1))) {
         pa_log("Failed to open file %s", fname);
+#ifdef __TIZEN__
+        fd = -1;
+#endif
         goto finish;
     }