From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kővágó@redhat.com, Zoltán <DirtY.iCE.hu@gmail.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>
Subject: [PULL 01/13] audio: fix parameter dereference before NULL check
Date: Fri, 18 Oct 2019 09:41:32 +0200 [thread overview]
Message-ID: <20191018074144.24071-2-kraxel@redhat.com> (raw)
In-Reply-To: <20191018074144.24071-1-kraxel@redhat.com>
From: Kővágó, Zoltán <dirty.ice.hu@gmail.com>
This should fix Coverity issues CID 1405305 and 1405301.
Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Message-id: 0eadcc88b8421bb86ce2d68ac70517f920c3ad6c.1568157545.git.DirtY.iCE.hu@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
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
next prev parent reply other threads:[~2019-10-18 7:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 7:41 [PULL 00/13] Audio 20191018 patches Gerd Hoffmann
2019-10-18 7:41 ` Gerd Hoffmann [this message]
2019-10-18 7:41 ` [PULL 02/13] audio: paaudio: fix connection and stream name Gerd Hoffmann
2019-10-18 7:41 ` [PULL 03/13] audio: paaudio: ability to specify " Gerd Hoffmann
2019-10-18 7:41 ` [PULL 04/13] audio: add mixing-engine option (documentation) Gerd Hoffmann
2019-10-18 7:41 ` [PULL 05/13] audio: make mixeng optional Gerd Hoffmann
2019-10-18 7:41 ` [PULL 06/13] paaudio: get/put_buffer functions Gerd Hoffmann
2019-10-18 7:41 ` [PULL 07/13] audio: support more than two channels in volume setting Gerd Hoffmann
2019-10-18 7:41 ` [PULL 08/13] audio: replace shift in audio_pcm_info with bytes_per_frame Gerd Hoffmann
2019-10-18 7:41 ` [PULL 09/13] audio: basic support for multichannel audio Gerd Hoffmann
2019-10-18 7:41 ` [PULL 10/13] usb-audio: do not count on avail bytes actually available Gerd Hoffmann
2019-10-18 7:41 ` [PULL 11/13] usb-audio: support more than two channels of audio Gerd Hoffmann
2019-10-18 7:41 ` [PULL 12/13] usbaudio: change playback counters to 64 bit Gerd Hoffmann
2019-10-18 7:41 ` [PULL 13/13] paaudio: fix channel order for usb-audio 5.1 and 7.1 streams Gerd Hoffmann
2019-10-18 15:36 ` [PULL 00/13] Audio 20191018 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191018074144.24071-2-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=DirtY.iCE.hu@gmail.com \
--cc=Kővágó@redhat.com \
--cc=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).