summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2005-06-30 12:46:24 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2005-06-30 12:46:24 +0000
commitc27721c47e56ef115dcde1862579637165e6b221 (patch)
tree338a1d539b76fe51bd2bdcc7e070c00034956335
parent926b61f1601ef6b8b0229aeca63859b790be7751 (diff)
downloadgst-plugins-bad-c27721c47e56ef115dcde1862579637165e6b221.tar.gz
gst-plugins-bad-c27721c47e56ef115dcde1862579637165e6b221.tar.bz2
gst-plugins-bad-c27721c47e56ef115dcde1862579637165e6b221.zip
FORTIFY fixes
Original commit message from CVS: FORTIFY fixes
m---------common0
-rw-r--r--gst/modplug/libmodplug/load_it.cpp17
2 files changed, 9 insertions, 8 deletions
diff --git a/common b/common
-Subproject 2826306411790bf8aa9298922aa59b126897431
+Subproject 4ca96aedcf2be0b3dcf31fce732aed1da21b885
diff --git a/gst/modplug/libmodplug/load_it.cpp b/gst/modplug/libmodplug/load_it.cpp
index 29ea0d24..7664eb4e 100644
--- a/gst/modplug/libmodplug/load_it.cpp
+++ b/gst/modplug/libmodplug/load_it.cpp
@@ -1299,6 +1299,7 @@ UINT CSoundFile::SaveMixPlugins(FILE *f, BOOL bUpdate)
DWORD nPluginSize;
UINT nTotalSize = 0;
UINT nChInfo = 0;
+ size_t res = 0;
for (UINT i=0; i<MAX_MIXPLUGINS; i++)
{
@@ -1320,13 +1321,13 @@ UINT CSoundFile::SaveMixPlugins(FILE *f, BOOL bUpdate)
s[1] = 'X';
s[2] = '0' + (i/10);
s[3] = '0' + (i%10);
- fwrite(s, 1, 4, f);
- fwrite(&nPluginSize, 1, 4, f);
- fwrite(&p->Info, 1, sizeof(SNDMIXPLUGININFO), f);
- fwrite(&m_MixPlugins[i].nPluginDataSize, 1, 4, f);
+ res = fwrite(s, 1, 4, f);
+ res = fwrite(&nPluginSize, 1, 4, f);
+ res = fwrite(&p->Info, 1, sizeof(SNDMIXPLUGININFO), f);
+ res = fwrite(&m_MixPlugins[i].nPluginDataSize, 1, 4, f);
if (m_MixPlugins[i].pPluginData)
{
- fwrite(m_MixPlugins[i].pPluginData, 1, m_MixPlugins[i].nPluginDataSize, f);
+ res = fwrite(m_MixPlugins[i].pPluginData, 1, m_MixPlugins[i].nPluginDataSize, f);
}
}
nTotalSize += nPluginSize + 8;
@@ -1347,10 +1348,10 @@ UINT CSoundFile::SaveMixPlugins(FILE *f, BOOL bUpdate)
if (f)
{
nPluginSize = 0x58464843;
- fwrite(&nPluginSize, 1, 4, f);
+ res = fwrite(&nPluginSize, 1, 4, f);
nPluginSize = nChInfo*4;
- fwrite(&nPluginSize, 1, 4, f);
- fwrite(chinfo, 1, nPluginSize, f);
+ res = fwrite(&nPluginSize, 1, 4, f);
+ res = fwrite(chinfo, 1, nPluginSize, f);
}
nTotalSize += nChInfo*4 + 8;
}