2014-02-05 15:44:02

by Andrei Emeltchenko

Subject: [PATCH] android/haltest: Close file in case of error

From: Andrei Emeltchenko <[email protected]>

---
android/client/if-audio.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/android/client/if-audio.c b/android/client/if-audio.c
index 66f8364..bb8f51b 100644
--- a/android/client/if-audio.c
+++ b/android/client/if-audio.c
@@ -258,6 +258,7 @@ static void play_p(int argc, const char **argv)

if (buffer_size == 0) {
haltest_error("Invalid buffer size. Was stream_out opened?\n");
+ fclose(in);
return;
}

@@ -265,12 +266,15 @@ static void play_p(int argc, const char **argv)
if (current_state != STATE_STOPPED) {
haltest_error("Already playing or stream suspended!\n");
pthread_mutex_unlock(&state_mutex);
+ fclose(in);
return;
}
pthread_mutex_unlock(&state_mutex);

- if (pthread_create(&play_thread, NULL, playback_thread, in) != 0)
+ if (pthread_create(&play_thread, NULL, playback_thread, in) != 0) {
haltest_error("Cannot create playback thread!\n");
+ fclose(in);
+ }
}

static void stop_p(int argc, const char **argv)
--
1.8.3.2

2014-02-07 10:05:01

by Szymon Janc

Subject: Re: [PATCHv2 1/2] android/haltest: Close file in case of error

Hi Andrei,

On Thursday 06 of February 2014 16:22:42 Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> ---
> android/client/if-audio.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/android/client/if-audio.c b/android/client/if-audio.c
> index 66f8364..3b34c95 100644
> --- a/android/client/if-audio.c
> +++ b/android/client/if-audio.c
> @@ -258,19 +258,26 @@ static void play_p(int argc, const char **argv)
>
> if (buffer_size == 0) {
> haltest_error("Invalid buffer size. Was stream_out opened?\n");
> - return;
> + goto fail;
> }
>
> pthread_mutex_lock(&state_mutex);
> if (current_state != STATE_STOPPED) {
> haltest_error("Already playing or stream suspended!\n");
> pthread_mutex_unlock(&state_mutex);
> - return;
> + goto fail;
> }
> pthread_mutex_unlock(&state_mutex);
>
> - if (pthread_create(&play_thread, NULL, playback_thread, in) != 0)
> + if (pthread_create(&play_thread, NULL, playback_thread, in) != 0) {
> haltest_error("Cannot create playback thread!\n");
> + goto fail;
> + }
> +
> + return;
> +fail:
> + if (in)
> + fclose(in);
> }
>
> static void stop_p(int argc, const char **argv)
>

This patch is now upstream, thanks.

--
Best regards,
Szymon Janc

2014-02-06 14:22:42

by Andrei Emeltchenko

Subject: [PATCHv2 1/2] android/haltest: Close file in case of error

From: Andrei Emeltchenko <[email protected]>

---
android/client/if-audio.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/android/client/if-audio.c b/android/client/if-audio.c
index 66f8364..3b34c95 100644
--- a/android/client/if-audio.c
+++ b/android/client/if-audio.c
@@ -258,19 +258,26 @@ static void play_p(int argc, const char **argv)

if (buffer_size == 0) {
haltest_error("Invalid buffer size. Was stream_out opened?\n");
- return;
+ goto fail;
}

pthread_mutex_lock(&state_mutex);
if (current_state != STATE_STOPPED) {
haltest_error("Already playing or stream suspended!\n");
pthread_mutex_unlock(&state_mutex);
- return;
+ goto fail;
}
pthread_mutex_unlock(&state_mutex);

- if (pthread_create(&play_thread, NULL, playback_thread, in) != 0)
+ if (pthread_create(&play_thread, NULL, playback_thread, in) != 0) {
haltest_error("Cannot create playback thread!\n");
+ goto fail;
+ }
+
+ return;
+fail:
+ if (in)
+ fclose(in);
}

static void stop_p(int argc, const char **argv)
--
1.8.3.2

2014-02-06 14:22:43

by Andrei Emeltchenko

Subject: [PATCHv2 2/2] android/haltest: Remove unneeded assignment

From: Andrei Emeltchenko <[email protected]>

---
android/client/if-audio.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/android/client/if-audio.c b/android/client/if-audio.c
index 3b34c95..f449b49 100644
--- a/android/client/if-audio.c
+++ b/android/client/if-audio.c
@@ -225,10 +225,8 @@ static void *playback_thread(void *data)
pthread_mutex_unlock(&outstream_mutex);
} while (len && w_len);

- if (in) {
+ if (in)
fclose(in);
- in = NULL;
- }

pthread_cleanup_pop(1);
return NULL;
--
1.8.3.2

2014-02-06 14:13:07

by Andrei Emeltchenko

Subject: Re: [PATCH] android/haltest: Close file in case of error

On Wed, Feb 05, 2014 at 05:44:02PM +0200, Andrei Emeltchenko wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> ---
> android/client/if-audio.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/android/client/if-audio.c b/android/client/if-audio.c
> index 66f8364..bb8f51b 100644
> --- a/android/client/if-audio.c
> +++ b/android/client/if-audio.c
> @@ -258,6 +258,7 @@ static void play_p(int argc, const char **argv)
>
> if (buffer_size == 0) {
> haltest_error("Invalid buffer size. Was stream_out opened?\n");
> + fclose(in);

sorry, need to check for NULL here and below.

Best regards
Andrei Emeltchenko

> return;
> }
>
> @@ -265,12 +266,15 @@ static void play_p(int argc, const char **argv)
> if (current_state != STATE_STOPPED) {
> haltest_error("Already playing or stream suspended!\n");
> pthread_mutex_unlock(&state_mutex);
> + fclose(in);
> return;
> }
> pthread_mutex_unlock(&state_mutex);
>
> - if (pthread_create(&play_thread, NULL, playback_thread, in) != 0)
> + if (pthread_create(&play_thread, NULL, playback_thread, in) != 0) {
> haltest_error("Cannot create playback thread!\n");
> + fclose(in);
> + }
> }
>
> static void stop_p(int argc, const char **argv)
> --
> 1.8.3.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html