OSDN Git Service
(root)
/
android-x86
/
external-bluetooth-sbc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5cb33fd
)
sbc: don't dereference sbc pointer if NULL
author
Marc-André Lureau
<marc-andre.lureau@nokia.com>
Tue, 17 Feb 2009 20:46:41 +0000
(22:46 +0200)
committer
Marcel Holtmann
<marcel@holtmann.org>
Mon, 30 Jul 2012 02:48:28 +0000
(19:48 -0700)
sbc/sbc.c
patch
|
blob
|
history
diff --git
a/sbc/sbc.c
b/sbc/sbc.c
index
e2e7c61
..
a33ed57
100644
(file)
--- 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;