Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
miniaudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
miniaudio
Commits
44ba584c
Commit
44ba584c
authored
Mar 18, 2018
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace some instances of mal_strcpy_s() with mal_strncpy_s().
parent
2c01858f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
17 deletions
+17
-17
mini_al.h
mini_al.h
+17
-17
No files found.
mini_al.h
View file @
44ba584c
...
@@ -3417,7 +3417,7 @@ mal_result mal_context_enumerate_devices__null(mal_context* pContext, mal_enum_d
...
@@ -3417,7 +3417,7 @@ mal_result mal_context_enumerate_devices__null(mal_context* pContext, mal_enum_d
if
(
cbResult
)
{
if
(
cbResult
)
{
mal_device_info
deviceInfo
;
mal_device_info
deviceInfo
;
mal_zero_object
(
&
deviceInfo
);
mal_zero_object
(
&
deviceInfo
);
mal_str
cpy_s
(
deviceInfo
.
name
,
sizeof
(
deviceInfo
.
name
),
"NULL Playback Device"
);
mal_str
ncpy_s
(
deviceInfo
.
name
,
sizeof
(
deviceInfo
.
name
),
"NULL Playback Device"
,
(
size_t
)
-
1
);
cbResult
=
callback
(
pContext
,
mal_device_type_playback
,
&
deviceInfo
,
pUserData
);
cbResult
=
callback
(
pContext
,
mal_device_type_playback
,
&
deviceInfo
,
pUserData
);
}
}
...
@@ -3425,7 +3425,7 @@ mal_result mal_context_enumerate_devices__null(mal_context* pContext, mal_enum_d
...
@@ -3425,7 +3425,7 @@ mal_result mal_context_enumerate_devices__null(mal_context* pContext, mal_enum_d
if
(
cbResult
)
{
if
(
cbResult
)
{
mal_device_info
deviceInfo
;
mal_device_info
deviceInfo
;
mal_zero_object
(
&
deviceInfo
);
mal_zero_object
(
&
deviceInfo
);
mal_str
cpy_s
(
deviceInfo
.
name
,
sizeof
(
deviceInfo
.
name
),
"NULL Capture Device"
);
mal_str
ncpy_s
(
deviceInfo
.
name
,
sizeof
(
deviceInfo
.
name
),
"NULL Capture Device"
,
(
size_t
)
-
1
);
cbResult
=
callback
(
pContext
,
mal_device_type_capture
,
&
deviceInfo
,
pUserData
);
cbResult
=
callback
(
pContext
,
mal_device_type_capture
,
&
deviceInfo
,
pUserData
);
}
}
...
@@ -3443,9 +3443,9 @@ mal_result mal_context_get_device_info__null(mal_context* pContext, mal_device_t
...
@@ -3443,9 +3443,9 @@ mal_result mal_context_get_device_info__null(mal_context* pContext, mal_device_t
// Name / Description
// Name / Description
if
(
deviceType
==
mal_device_type_playback
)
{
if
(
deviceType
==
mal_device_type_playback
)
{
mal_str
cpy_s
(
pDeviceInfo
->
name
,
sizeof
(
pDeviceInfo
->
name
),
"NULL Playback Device"
);
mal_str
ncpy_s
(
pDeviceInfo
->
name
,
sizeof
(
pDeviceInfo
->
name
),
"NULL Playback Device"
,
(
size_t
)
-
1
);
}
else
{
}
else
{
mal_str
cpy_s
(
pDeviceInfo
->
name
,
sizeof
(
pDeviceInfo
->
name
),
"NULL Capture Device"
);
mal_str
ncpy_s
(
pDeviceInfo
->
name
,
sizeof
(
pDeviceInfo
->
name
),
"NULL Capture Device"
,
(
size_t
)
-
1
);
}
}
return
MAL_SUCCESS
;
return
MAL_SUCCESS
;
...
@@ -6441,7 +6441,7 @@ mal_result mal_context_get_device_info_from_WAVECAPS(mal_context* pContext, MAL_
...
@@ -6441,7 +6441,7 @@ mal_result mal_context_get_device_info_from_WAVECAPS(mal_context* pContext, MAL_
// looking in the registry for the full name. If we can't find it there, we need to just fall back to the default name.
// looking in the registry for the full name. If we can't find it there, we need to just fall back to the default name.
// Set the default to begin with.
// Set the default to begin with.
mal_str
cpy_s
(
pDeviceInfo
->
name
,
sizeof
(
pDeviceInfo
->
name
),
pCaps
->
szPname
);
mal_str
ncpy_s
(
pDeviceInfo
->
name
,
sizeof
(
pDeviceInfo
->
name
),
pCaps
->
szPname
,
(
size_t
)
-
1
);
// Now try the registry. There's a few things to consider here:
// Now try the registry. There's a few things to consider here:
// - The name GUID can be null, in which we case we just need to stick to the original 31 characters.
// - The name GUID can be null, in which we case we just need to stick to the original 31 characters.
...
@@ -7824,7 +7824,7 @@ mal_result mal_context_enumerate_devices__alsa(mal_context* pContext, mal_enum_d
...
@@ -7824,7 +7824,7 @@ mal_result mal_context_enumerate_devices__alsa(mal_context* pContext, mal_enum_d
}
}
}
else
{
}
else
{
// There's no second line. Just copy the whole description.
// There's no second line. Just copy the whole description.
mal_str
cpy_s
(
deviceInfo
.
name
,
sizeof
(
deviceInfo
.
name
),
DESC
);
mal_str
ncpy_s
(
deviceInfo
.
name
,
sizeof
(
deviceInfo
.
name
),
DESC
,
(
size_t
)
-
1
);
}
}
}
}
...
@@ -7887,11 +7887,11 @@ mal_bool32 mal_context_get_device_info_enum_callback__alsa(mal_context* pContext
...
@@ -7887,11 +7887,11 @@ mal_bool32 mal_context_get_device_info_enum_callback__alsa(mal_context* pContext
mal_assert
(
pData
!=
NULL
);
mal_assert
(
pData
!=
NULL
);
if
(
pData
->
pDeviceID
==
NULL
&&
strcmp
(
pDeviceInfo
->
id
.
alsa
,
"default"
)
==
0
)
{
if
(
pData
->
pDeviceID
==
NULL
&&
strcmp
(
pDeviceInfo
->
id
.
alsa
,
"default"
)
==
0
)
{
mal_str
cpy_s
(
pData
->
pDeviceInfo
->
name
,
sizeof
(
pData
->
pDeviceInfo
->
name
),
pDeviceInfo
->
name
);
mal_str
ncpy_s
(
pData
->
pDeviceInfo
->
name
,
sizeof
(
pData
->
pDeviceInfo
->
name
),
pDeviceInfo
->
name
,
(
size_t
)
-
1
);
pData
->
foundDevice
=
MAL_TRUE
;
pData
->
foundDevice
=
MAL_TRUE
;
}
else
{
}
else
{
if
(
pData
->
deviceType
==
deviceType
&&
mal_context_is_device_id_equal__alsa
(
pContext
,
pData
->
pDeviceID
,
&
pDeviceInfo
->
id
))
{
if
(
pData
->
deviceType
==
deviceType
&&
mal_context_is_device_id_equal__alsa
(
pContext
,
pData
->
pDeviceID
,
&
pDeviceInfo
->
id
))
{
mal_str
cpy_s
(
pData
->
pDeviceInfo
->
name
,
sizeof
(
pData
->
pDeviceInfo
->
name
),
pDeviceInfo
->
name
);
mal_str
ncpy_s
(
pData
->
pDeviceInfo
->
name
,
sizeof
(
pData
->
pDeviceInfo
->
name
),
pDeviceInfo
->
name
,
(
size_t
)
-
1
);
pData
->
foundDevice
=
MAL_TRUE
;
pData
->
foundDevice
=
MAL_TRUE
;
}
}
}
}
...
@@ -8480,7 +8480,7 @@ static mal_result mal_enumerate_devices__alsa(mal_context* pContext, mal_device_
...
@@ -8480,7 +8480,7 @@ static mal_result mal_enumerate_devices__alsa(mal_context* pContext, mal_device_
}
}
}
else
{
}
else
{
// There's no second line. Just copy the whole description.
// There's no second line. Just copy the whole description.
mal_str
cpy_s
(
pInfo
->
name
,
sizeof
(
pInfo
->
name
),
DESC
);
mal_str
ncpy_s
(
pInfo
->
name
,
sizeof
(
pInfo
->
name
),
DESC
,
(
size_t
)
-
1
);
}
}
}
}
...
@@ -9874,11 +9874,11 @@ static void mal_context_get_device_info_sink_callback__pulse(mal_pa_context* pPu
...
@@ -9874,11 +9874,11 @@ static void mal_context_get_device_info_sink_callback__pulse(mal_pa_context* pPu
pData
->
foundDevice
=
MAL_TRUE
;
pData
->
foundDevice
=
MAL_TRUE
;
if
(
pInfo
->
name
!=
NULL
)
{
if
(
pInfo
->
name
!=
NULL
)
{
mal_str
cpy_s
(
pData
->
pDeviceInfo
->
id
.
pulse
,
sizeof
(
pData
->
pDeviceInfo
->
id
.
pulse
),
pInfo
->
name
);
mal_str
ncpy_s
(
pData
->
pDeviceInfo
->
id
.
pulse
,
sizeof
(
pData
->
pDeviceInfo
->
id
.
pulse
),
pInfo
->
name
,
(
size_t
)
-
1
);
}
}
if
(
pInfo
->
description
!=
NULL
)
{
if
(
pInfo
->
description
!=
NULL
)
{
mal_str
cpy_s
(
pData
->
pDeviceInfo
->
name
,
sizeof
(
pData
->
pDeviceInfo
->
name
),
pInfo
->
description
);
mal_str
ncpy_s
(
pData
->
pDeviceInfo
->
name
,
sizeof
(
pData
->
pDeviceInfo
->
name
),
pInfo
->
description
,
(
size_t
)
-
1
);
}
}
}
}
...
@@ -9893,11 +9893,11 @@ static void mal_context_get_device_info_source_callback__pulse(mal_pa_context* p
...
@@ -9893,11 +9893,11 @@ static void mal_context_get_device_info_source_callback__pulse(mal_pa_context* p
pData
->
foundDevice
=
MAL_TRUE
;
pData
->
foundDevice
=
MAL_TRUE
;
if
(
pInfo
->
name
!=
NULL
)
{
if
(
pInfo
->
name
!=
NULL
)
{
mal_str
cpy_s
(
pData
->
pDeviceInfo
->
id
.
pulse
,
sizeof
(
pData
->
pDeviceInfo
->
id
.
pulse
),
pInfo
->
name
);
mal_str
ncpy_s
(
pData
->
pDeviceInfo
->
id
.
pulse
,
sizeof
(
pData
->
pDeviceInfo
->
id
.
pulse
),
pInfo
->
name
,
(
size_t
)
-
1
);
}
}
if
(
pInfo
->
description
!=
NULL
)
{
if
(
pInfo
->
description
!=
NULL
)
{
mal_str
cpy_s
(
pData
->
pDeviceInfo
->
name
,
sizeof
(
pData
->
pDeviceInfo
->
name
),
pInfo
->
description
);
mal_str
ncpy_s
(
pData
->
pDeviceInfo
->
name
,
sizeof
(
pData
->
pDeviceInfo
->
name
),
pInfo
->
description
,
(
size_t
)
-
1
);
}
}
}
}
...
@@ -10375,7 +10375,7 @@ static void mal_device_sink_name_callback(mal_pa_context* pPulseContext, const m
...
@@ -10375,7 +10375,7 @@ static void mal_device_sink_name_callback(mal_pa_context* pPulseContext, const m
mal_device
*
pDevice
=
(
mal_device
*
)
pUserData
;
mal_device
*
pDevice
=
(
mal_device
*
)
pUserData
;
mal_assert
(
pDevice
!=
NULL
);
mal_assert
(
pDevice
!=
NULL
);
mal_str
cpy_s
(
pDevice
->
name
,
sizeof
(
pDevice
->
name
),
pInfo
->
description
);
mal_str
ncpy_s
(
pDevice
->
name
,
sizeof
(
pDevice
->
name
),
pInfo
->
description
,
(
size_t
)
-
1
);
}
}
static
void
mal_device_source_name_callback
(
mal_pa_context
*
pPulseContext
,
const
mal_pa_source_info
*
pInfo
,
int
endOfList
,
void
*
pUserData
)
static
void
mal_device_source_name_callback
(
mal_pa_context
*
pPulseContext
,
const
mal_pa_source_info
*
pInfo
,
int
endOfList
,
void
*
pUserData
)
...
@@ -10387,7 +10387,7 @@ static void mal_device_source_name_callback(mal_pa_context* pPulseContext, const
...
@@ -10387,7 +10387,7 @@ static void mal_device_source_name_callback(mal_pa_context* pPulseContext, const
mal_device
*
pDevice
=
(
mal_device
*
)
pUserData
;
mal_device
*
pDevice
=
(
mal_device
*
)
pUserData
;
mal_assert
(
pDevice
!=
NULL
);
mal_assert
(
pDevice
!=
NULL
);
mal_str
cpy_s
(
pDevice
->
name
,
sizeof
(
pDevice
->
name
),
pInfo
->
description
);
mal_str
ncpy_s
(
pDevice
->
name
,
sizeof
(
pDevice
->
name
),
pInfo
->
description
,
(
size_t
)
-
1
);
}
}
static
void
mal_device_uninit__pulse
(
mal_device
*
pDevice
)
static
void
mal_device_uninit__pulse
(
mal_device
*
pDevice
)
...
@@ -10557,7 +10557,7 @@ static mal_result mal_device_init__pulse(mal_context* pContext, mal_device_type
...
@@ -10557,7 +10557,7 @@ static mal_result mal_device_init__pulse(mal_context* pContext, mal_device_type
char
streamName
[
256
];
char
streamName
[
256
];
if
(
pConfig
->
pulse
.
pStreamName
!=
NULL
)
{
if
(
pConfig
->
pulse
.
pStreamName
!=
NULL
)
{
mal_str
cpy_s
(
streamName
,
sizeof
(
streamName
),
pConfig
->
pulse
.
pStreamName
);
mal_str
ncpy_s
(
streamName
,
sizeof
(
streamName
),
pConfig
->
pulse
.
pStreamName
,
(
size_t
)
-
1
);
}
else
{
}
else
{
static
int
g_StreamCounter
=
0
;
static
int
g_StreamCounter
=
0
;
mal_strcpy_s
(
streamName
,
sizeof
(
streamName
),
"mini_al:"
);
mal_strcpy_s
(
streamName
,
sizeof
(
streamName
),
"mini_al:"
);
...
@@ -12795,7 +12795,7 @@ mal_bool32 mal_context_get_device_info_enum_callback__openal(mal_context* pConte
...
@@ -12795,7 +12795,7 @@ mal_bool32 mal_context_get_device_info_enum_callback__openal(mal_context* pConte
mal_assert
(
pData
!=
NULL
);
mal_assert
(
pData
!=
NULL
);
if
(
pData
->
deviceType
==
deviceType
&&
mal_context_is_device_id_equal__openal
(
pContext
,
pData
->
pDeviceID
,
&
pDeviceInfo
->
id
))
{
if
(
pData
->
deviceType
==
deviceType
&&
mal_context_is_device_id_equal__openal
(
pContext
,
pData
->
pDeviceID
,
&
pDeviceInfo
->
id
))
{
mal_str
cpy_s
(
pData
->
pDeviceInfo
->
name
,
sizeof
(
pData
->
pDeviceInfo
->
name
),
pDeviceInfo
->
name
);
mal_str
ncpy_s
(
pData
->
pDeviceInfo
->
name
,
sizeof
(
pData
->
pDeviceInfo
->
name
),
pDeviceInfo
->
name
,
(
size_t
)
-
1
);
pData
->
foundDevice
=
MAL_TRUE
;
pData
->
foundDevice
=
MAL_TRUE
;
}
}
...
...
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