Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix rpmbuild error in librojectm 

When using rpmbuild on Fedora 33, the build fails with:
error: ‘__builtin_strncpy’ specified bound depends on the length of the source argument [-Werror=stringop-overflow=]

This was fixed as part of projectm change d4d74f6d. This change takes the
relevant parts of that commit.

Note that the projectm commit contains several other warning fixes that might
affect Clementine builds in the future.
This commit is contained in:
Jim Broadus 2020-12-16 23:11:22 -08:00 committed by John Maguire
parent cfcd0a956e
commit d7966c8285
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/libprojectm/MilkdropPresetFactory/InitCond.cpp vendored
View File

@ -138,7 +138,7 @@ void InitCond::init_cond_to_string() {
return;
/* Copy the string into the initial condition string buffer */
strncpy(init_cond_string_buffer + init_cond_string_buffer_index, string, string_length);
memcpy(init_cond_string_buffer + init_cond_string_buffer_index, string, string_length + 1);
/* Increment the string buffer, offset by one for the null terminator, which will be
overwritten by the next call to this function */

4
3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp vendored
View File

@ -331,7 +331,7 @@ int Parser::parse_per_pixel_eqn(std::istream & fs, MilkdropPreset * preset, cha
if (init_string != 0)
{
strncpy(string, init_string, strlen(init_string));
memcpy(string, init_string, strlen(init_string) + 1);
}
else
{
@ -2254,7 +2254,7 @@ int Parser::parse_wave_helper(std::istream & fs, MilkdropPreset * preset, int
/// HACK the parse_line code already parsed the per_pixel variable name. This handles that case
/// Parser needs reworked. Don't have time for it. So this is the result.
if (init_string)
strncpy(string, init_string, strlen(init_string));
memcpy(string, init_string, strlen(init_string)+1);
else
{
if (parseToken(fs, string) != tEq)