Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
d42342e0
Commit
d42342e0
authored
Aug 05, 2021
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/oss: check returned value in oss_try_ioctl()
parent
8da3f8c6
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
OssOutputPlugin.cxx
src/output/plugins/OssOutputPlugin.cxx
+11
-6
No files found.
src/output/plugins/OssOutputPlugin.cxx
View file @
d42342e0
...
...
@@ -252,19 +252,24 @@ oss_try_ioctl_r(FileDescriptor fd, unsigned long request, int *value_r,
}
/**
* Invoke an ioctl on the OSS file descriptor.
* Invoke an ioctl on the OSS file descriptor, and expect an
* unmodified effective value.
*
* Throws on error.
*/
static
void
oss_try_ioctl
(
FileDescriptor
fd
,
unsigned
long
request
,
int
value
,
OssIoctlExact
(
FileDescriptor
fd
,
unsigned
long
request
,
int
requested_
value
,
const
char
*
msg
)
{
assert
(
fd
.
IsDefined
());
assert
(
msg
!=
nullptr
);
if
(
ioctl
(
fd
.
Get
(),
request
,
&
value
)
<
0
)
int
effective_value
=
requested_value
;
if
(
ioctl
(
fd
.
Get
(),
request
,
&
effective_value
)
<
0
)
throw
MakeErrno
(
msg
);
if
(
effective_value
!=
requested_value
)
throw
std
::
runtime_error
(
msg
);
}
/**
...
...
@@ -529,11 +534,11 @@ try {
if
(
!
fd
.
Open
(
device
,
O_WRONLY
))
throw
FormatErrno
(
"Error opening OSS device
\"
%s
\"
"
,
device
);
oss_try_ioctl
(
fd
,
SNDCTL_DSP_CHANNELS
,
audio_format
.
channels
,
OssIoctlExact
(
fd
,
SNDCTL_DSP_CHANNELS
,
audio_format
.
channels
,
"Failed to set channel count"
);
oss_try_ioctl
(
fd
,
SNDCTL_DSP_SPEED
,
audio_format
.
sample_rate
,
OssIoctlExact
(
fd
,
SNDCTL_DSP_SPEED
,
audio_format
.
sample_rate
,
"Failed to set sample rate"
);
oss_try_ioctl
(
fd
,
SNDCTL_DSP_SAMPLESIZE
,
oss_format
,
OssIoctlExact
(
fd
,
SNDCTL_DSP_SAMPLESIZE
,
oss_format
,
"Failed to set sample format"
);
}
catch
(...)
{
DoClose
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment