opelly/Stockfish
1
0
Fork 0
mirror of https://github.com/opelly27/Stockfish.git synced 2026-05-20 06:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent out of bounds access of dbg info arrays

Browse Source 
closes https://github.com/official-stockfish/Stockfish/pull/5721

No functional change
This commit is contained in:
Shawn Xu
2024-12-15 01:35:15 -08:00
committed by Disservin
parent ba145332c9
commit 77ec878ffa
1 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/misc.cpp
+29 -24
View File
@@ -18,7 +18,9 @@
#include "misc.h" #include "misc.h"
#include <array>
#include <atomic> #include <atomic>
#include <cassert>
#include <cctype> #include <cctype>
#include <cmath> #include <cmath>
#include <cstdlib> #include <cstdlib>
@@ -287,7 +289,10 @@ template<size_t N>
struct DebugInfo { struct DebugInfo {
std::atomic<int64_t> data[N] = {0}; std::atomic<int64_t> data[N] = {0};
constexpr std::atomic<int64_t>& operator[](int index) { return data[index]; } [[nodiscard]] constexpr std::atomic<int64_t>& operator[](size_t index) {
assert(index < N);
return data[index];
}
}; };
struct DebugExtremes: public DebugInfo<3> { struct DebugExtremes: public DebugInfo<3> {
@@ -297,54 +302,54 @@ struct DebugExtremes: public DebugInfo<3> {
} }
}; };
DebugInfo<2> hit[MaxDebugSlots]; std::array<DebugInfo<2>, MaxDebugSlots> hit;
DebugInfo<2> mean[MaxDebugSlots]; std::array<DebugInfo<2>, MaxDebugSlots> mean;
DebugInfo<3> stdev[MaxDebugSlots]; std::array<DebugInfo<3>, MaxDebugSlots> stdev;
DebugInfo<6> correl[MaxDebugSlots]; std::array<DebugInfo<6>, MaxDebugSlots> correl;
DebugExtremes extremes[MaxDebugSlots]; std::array<DebugExtremes, MaxDebugSlots> extremes;
} // namespace } // namespace
void dbg_hit_on(bool cond, int slot) { void dbg_hit_on(bool cond, int slot) {
++hit[slot][0]; ++hit.at(slot)[0];
if (cond) if (cond)
++hit[slot][1]; ++hit.at(slot)[1];
} }
void dbg_mean_of(int64_t value, int slot) { void dbg_mean_of(int64_t value, int slot) {
++mean[slot][0]; ++mean.at(slot)[0];
mean[slot][1] += value; mean.at(slot)[1] += value;
} }
void dbg_stdev_of(int64_t value, int slot) { void dbg_stdev_of(int64_t value, int slot) {
++stdev[slot][0]; ++stdev.at(slot)[0];
stdev[slot][1] += value; stdev.at(slot)[1] += value;
stdev[slot][2] += value * value; stdev.at(slot)[2] += value * value;
} }
void dbg_extremes_of(int64_t value, int slot) { void dbg_extremes_of(int64_t value, int slot) {
++extremes[slot][0]; ++extremes.at(slot)[0];
int64_t current_max = extremes[slot][1].load(); int64_t current_max = extremes.at(slot)[1].load();
while (current_max < value && !extremes[slot][1].compare_exchange_weak(current_max, value)) while (current_max < value && !extremes.at(slot)[1].compare_exchange_weak(current_max, value))
{} {}
int64_t current_min = extremes[slot][2].load(); int64_t current_min = extremes.at(slot)[2].load();
while (current_min > value && !extremes[slot][2].compare_exchange_weak(current_min, value)) while (current_min > value && !extremes.at(slot)[2].compare_exchange_weak(current_min, value))
{} {}
} }
void dbg_correl_of(int64_t value1, int64_t value2, int slot) { void dbg_correl_of(int64_t value1, int64_t value2, int slot) {
++correl[slot][0]; ++correl.at(slot)[0];
correl[slot][1] += value1; correl.at(slot)[1] += value1;
correl[slot][2] += value1 * value1; correl.at(slot)[2] += value1 * value1;
correl[slot][3] += value2; correl.at(slot)[3] += value2;
correl[slot][4] += value2 * value2; correl.at(slot)[4] += value2 * value2;
correl[slot][5] += value1 * value2; correl.at(slot)[5] += value1 * value2;
} }
void dbg_print() { void dbg_print() {