third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix invalid memory access

Browse Source
This commit is contained in:
zihaomu 2022-12-28 17:16:11 +08:00
parent 838c34eee1
commit 71765858dc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/dnn/src/layers/fast_convolution/fast_convolution.cpp
View File

@ -448,7 +448,8 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr<FastConv>& co
int dilation_d = conv->dilation_d, dilation_h = conv->dilation_h, dilation_w = conv->dilation_w; int dilation_d = conv->dilation_d, dilation_h = conv->dilation_h, dilation_w = conv->dilation_w;
int ksize = Dk*Hk*Wk; int ksize = Dk*Hk*Wk;
bool fast_1x1 = stride_d == 1 && stride_w == 1 && stride_h == 1 && ksize == 1; bool fast_1x1 = ksize == 1 && stride_d == 1 && stride_w == 1 && stride_h == 1 &&
pad_front == 0 && pad_top == 0 && pad_left == 0;
int DkHkWkCg = Dk*Hk*Wk*Cg; int DkHkWkCg = Dk*Hk*Wk*Cg;
std::vector<int> ofstab_(Hk*Wk*Dk*4, 0); std::vector<int> ofstab_(Hk*Wk*Dk*4, 0);
@ -736,7 +737,8 @@ void runFastConv(InputArray _input, OutputArray _output, const Ptr<FastConv>& co
int d0 = std::max(0, (-in_d + dilation_d - 1) / dilation_d); int d0 = std::max(0, (-in_d + dilation_d - 1) / dilation_d);
int d1 = std::min(Dk, (Di - in_d + dilation_d - 1) / dilation_d); int d1 = std::min(Dk, (Di - in_d + dilation_d - 1) / dilation_d);
bool ok_i = 0 <= in_h && in_h < Hi - (Hk-1)*dilation_h; bool ok_i = 0 <= in_d && in_d < Di - (Dk-1)*dilation_d &&
0 <= in_h && in_h < Hi - (Hk-1)*dilation_h;
int h0 = std::max(0, (-in_h + dilation_h-1)/dilation_h); int h0 = std::max(0, (-in_h + dilation_h-1)/dilation_h);
int h1 = std::min(Hk, (Hi - in_h + dilation_h-1)/dilation_h); int h1 = std::min(Hk, (Hi - in_h + dilation_h-1)/dilation_h);