aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman Semenov <[email protected]>2022-09-23 18:21:16 +0000
committerGitHub <[email protected]>2022-09-23 11:21:16 -0700
commitcb679f9e89650dee3a26f285c8d3a4d32494af6e (patch)
tree1c13f1e42f6e694e2886b073e071e2db376a2ce2
parentb5d35008ed645857e46745e7b1744644fa4ea83e (diff)
Fixed bug and possible overflow type (#771)
-rw-r--r--al/effects/reverb.cpp2
-rw-r--r--common/win_main_utf8.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/al/effects/reverb.cpp b/al/effects/reverb.cpp
index 19b52d66..656642e0 100644
--- a/al/effects/reverb.cpp
+++ b/al/effects/reverb.cpp
@@ -1496,7 +1496,7 @@ void EaxReverbEffect::get2(const EaxCall& call, const Props2& props)
case DSPROPERTY_EAX20LISTENER_DECAYTIME: call.set_value<Exception>(props.flDecayTime); break;
case DSPROPERTY_EAX20LISTENER_DECAYHFRATIO: call.set_value<Exception>(props.flDecayHFRatio); break;
case DSPROPERTY_EAX20LISTENER_REFLECTIONS: call.set_value<Exception>(props.lReflections); break;
- case DSPROPERTY_EAX20LISTENER_REFLECTIONSDELAY: call.set_value<Exception>(props.flReverbDelay); break;
+ case DSPROPERTY_EAX20LISTENER_REFLECTIONSDELAY: call.set_value<Exception>(props.flReflectionsDelay); break;
case DSPROPERTY_EAX20LISTENER_REVERB: call.set_value<Exception>(props.lReverb); break;
case DSPROPERTY_EAX20LISTENER_REVERBDELAY: call.set_value<Exception>(props.flReverbDelay); break;
case DSPROPERTY_EAX20LISTENER_ENVIRONMENT: call.set_value<Exception>(props.dwEnvironment); break;
diff --git a/common/win_main_utf8.h b/common/win_main_utf8.h
index e40c2158..2f83560b 100644
--- a/common/win_main_utf8.h
+++ b/common/win_main_utf8.h
@@ -47,7 +47,7 @@ static FILE *my_fopen(const char *fname, const char *mode)
auto strbuf = std::make_unique<wchar_t[]>(static_cast<size_t>(namelen+modelen));
wname = strbuf.get();
#else
- wname = (wchar_t*)calloc(sizeof(wchar_t), (size_t)(namelen+modelen));
+ wname = (wchar_t*)calloc(sizeof(wchar_t), (size_t)namelen + modelen);
#endif
wmode = wname + namelen;
MultiByteToWideChar(CP_UTF8, 0, fname, -1, wname, namelen);