2009-02-17 20:46:41

by Marc-André Lureau

Subject: [PATCH] sbc: don't dereference sbc pointer if NULL

From: Marc-André Lureau <[email protected]>

---
sbc/sbc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbc/sbc.c b/sbc/sbc.c
index e2e7c61..a33ed57 100644
--- a/sbc/sbc.c
+++ b/sbc/sbc.c
@@ -985,7 +985,7 @@ int sbc_decode(sbc_t *sbc, void *input, int input_len, void *output,
char *ptr;
int i, ch, framelen, samples;

- if (!sbc && !input)
+ if (!sbc || !input)
return -EIO;

priv = sbc->priv;
@@ -1053,7 +1053,7 @@ int sbc_encode(sbc_t *sbc, void *input, int input_len, void *output,
const uint8_t *pcm, int16_t X[2][SBC_X_BUFFER_SIZE],
int nsamples, int nchannels);

- if (!sbc && !input)
+ if (!sbc || !input)
return -EIO;

priv = sbc->priv;
--
1.6.1.224.gb56c

2009-02-17 21:59:06

by Johan Hedberg

Subject: Re: [PATCH] sbc: don't dereference sbc pointer if NULL

On Tue, Feb 17, 2009, [email protected] wrote:
> diff --git a/sbc/sbc.c b/sbc/sbc.c
> index e2e7c61..a33ed57 100644
> --- a/sbc/sbc.c
> +++ b/sbc/sbc.c
> @@ -985,7 +985,7 @@ int sbc_decode(sbc_t *sbc, void *input, int input_len, void *output,
> char *ptr;
> int i, ch, framelen, samples;
>
> - if (!sbc && !input)
> + if (!sbc || !input)
> return -EIO;
>
> priv = sbc->priv;
> @@ -1053,7 +1053,7 @@ int sbc_encode(sbc_t *sbc, void *input, int input_len, void *output,
> const uint8_t *pcm, int16_t X[2][SBC_X_BUFFER_SIZE],
> int nsamples, int nchannels);
>
> - if (!sbc && !input)
> + if (!sbc || !input)
> return -EIO;
>
> priv = sbc->priv;

This one's now also pushed upstream.

Johan