zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-12 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Timidity::Renderer::reset_voices() must completely zero the

Browse source 
voices. Because this wasn't done, note_on() could try to access
  the sample for a voice that had never been played yet and access
  random memory. There may be other places where it's a problem, but
  this is where I noticed it, by chance.


SVN r1182 (trunk)
This commit is contained in:
Randy Heit 2008-08-23 02:38:00 +00:00
parent 39bb50376a
commit 0e5587812e
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/rh-log.txt
View file

@ -1,3 +1,10 @@
August 22, 2008
- Fixed: Timidity::Renderer::reset_voices() must completely zero the
voices. Because this wasn't done, note_on() could try to access
the sample for a voice that had never been played yet and access
random memory. There may be other places where it's a problem, but
this is where I noticed it, by chance.
August 21, 2008 (Changes by Graf Zahl) August 21, 2008 (Changes by Graf Zahl)
- Fixed: The conversion of the strings in wbstartstruct_t to FStrings - Fixed: The conversion of the strings in wbstartstruct_t to FStrings
caused crashes when reloading the hub data. caused crashes when reloading the hub data.

4
src/p_setup.cpp
View file

@ -2818,7 +2818,7 @@ static void P_GroupLines (bool buildmap)
Printf ("---Group Lines Times---\n"); Printf ("---Group Lines Times---\n");
for (i = 0; i < 7; ++i) for (i = 0; i < 7; ++i)
{ {
Printf (" time %d:%9.4f ms\n", i, times[i].Time() * 1e3); Printf (" time %d:%9.4f ms\n", i, times[i].TimeMS());
} }
} }
} }
@ -3553,7 +3553,7 @@ void P_SetupLevel (char *lumpname, int position)
"init polys", "init polys",
"precache" "precache"
}; };
Printf ("Time%3d:%9.4f ms (%s)\n", i, times[i].Time() * 1e3, timenames[i]); Printf ("Time%3d:%9.4f ms (%s)\n", i, times[i].TimeMS(), timenames[i]);
} }
} }
MapThingsConverted.Clear(); MapThingsConverted.Clear();

5
src/timidity/playmidi.cpp
View file

@ -36,10 +36,7 @@ namespace Timidity
void Renderer::reset_voices() void Renderer::reset_voices()
{ {
for (int i = 0; i < voices; i++) memset(voice, 0, sizeof(voice[0]) * voices);
{
voice[i].status = 0;
}
} }
/* Process the Reset All Controllers event */ /* Process the Reset All Controllers event */