gaozheng
/
geopro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(io/gpr): traces/大小计算改 64 位防溢出 

MSVC 的 long 是 32 位,samples*traces 大体下会溢出。
BScan.traces 改 std::int64_t;大小校验 expected 与 data
分配均在 64 位域计算,为后续整卷(数十亿体素)立纪律。
This commit is contained in:
gaozheng 2026-06-23 10:10:05 +08:00
parent 0d7f646941
commit 379875dff0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/io/gpr/IprbReader.cpp
View File

@ -13,9 +13,9 @@ BScan readIprb(const std::string& path, const IprHeader& h) {
}
const std::streamsize fileSize = f.tellg();
const long traces = h.lastTrace + 1;
const long count = static_cast<long>(h.samples) * traces;
const std::streamsize expected = static_cast<std::streamsize>(count) * 2;
const std::int64_t traces = static_cast<std::int64_t>(h.lastTrace) + 1;
const std::int64_t count = static_cast<std::int64_t>(h.samples) * traces;
const std::int64_t expected = count * 2;
if (fileSize != expected) {
throw std::runtime_error("readIprb: 文件大小与 samples*traces*2 不符: " + path);
}
@ -23,10 +23,10 @@ BScan readIprb(const std::string& path, const IprHeader& h) {
BScan b;
b.samples = h.samples;
b.traces = traces;
b.data.resize(static_cast<std::size_t>(count));
b.data.resize(static_cast<std::size_t>(h.samples) * traces);
f.seekg(0, std::ios::beg);
f.read(reinterpret_cast<char*>(b.data.data()), expected);
f.read(reinterpret_cast<char*>(b.data.data()), static_cast<std::streamsize>(expected));
if (!f) {
throw std::runtime_error("readIprb: 读取数据失败: " + path);
}

2
src/io/gpr/IprbReader.hpp
View File

@ -12,7 +12,7 @@ namespace geopro::io::gpr {
// 一个通道一条测线的雷达 B-scan 剖面（int16 存储，布局 [trace*samples + s]，s 最快）。
struct BScan {
int samples = 0;
long traces = 0;
std::int64_t traces = 0;
std::vector<int16_t> data; // 大小 = samples*traces
};