[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/13] audio: fix parameter dereference before NULL check
From: |
Gerd Hoffmann |
Subject: |
[PULL 01/13] audio: fix parameter dereference before NULL check |
Date: |
Fri, 18 Oct 2019 09:41:32 +0200 |
From: Kővágó, Zoltán <address@hidden>
This should fix Coverity issues CID 1405305 and 1405301.
Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
audio/audio_template.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/audio/audio_template.h b/audio/audio_template.h
index 235d1acbbebb..1006d6b1eb8a 100644
--- a/audio/audio_template.h
+++ b/audio/audio_template.h
@@ -425,8 +425,8 @@ SW *glue (AUD_open_, TYPE) (
struct audsettings *as
)
{
- AudioState *s = card->state;
- AudiodevPerDirectionOptions *pdo = glue(audio_get_pdo_, TYPE)(s->dev);
+ AudioState *s;
+ AudiodevPerDirectionOptions *pdo;
if (audio_bug(__func__, !card || !name || !callback_fn || !as)) {
dolog ("card=%p name=%p callback_fn=%p as=%p\n",
@@ -434,6 +434,9 @@ SW *glue (AUD_open_, TYPE) (
goto fail;
}
+ s = card->state;
+ pdo = glue(audio_get_pdo_, TYPE)(s->dev);
+
ldebug ("open %s, freq %d, nchannels %d, fmt %d\n",
name, as->freq, as->nchannels, as->fmt);
--
2.18.1
- [PULL 00/13] Audio 20191018 patches, Gerd Hoffmann, 2019/10/18
- [PULL 01/13] audio: fix parameter dereference before NULL check,
Gerd Hoffmann <=
- [PULL 03/13] audio: paaudio: ability to specify stream name, Gerd Hoffmann, 2019/10/18
- [PULL 13/13] paaudio: fix channel order for usb-audio 5.1 and 7.1 streams, Gerd Hoffmann, 2019/10/18
- [PULL 07/13] audio: support more than two channels in volume setting, Gerd Hoffmann, 2019/10/18
- [PULL 12/13] usbaudio: change playback counters to 64 bit, Gerd Hoffmann, 2019/10/18
- [PULL 09/13] audio: basic support for multichannel audio, Gerd Hoffmann, 2019/10/18
- [PULL 08/13] audio: replace shift in audio_pcm_info with bytes_per_frame, Gerd Hoffmann, 2019/10/18
- [PULL 10/13] usb-audio: do not count on avail bytes actually available, Gerd Hoffmann, 2019/10/18
- [PULL 04/13] audio: add mixing-engine option (documentation), Gerd Hoffmann, 2019/10/18
- [PULL 05/13] audio: make mixeng optional, Gerd Hoffmann, 2019/10/18
- [PULL 11/13] usb-audio: support more than two channels of audio, Gerd Hoffmann, 2019/10/18