Skip to content

Fix uninitialized value and memory leak in DePanEstimate #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
magiblot wants to merge 2 commits into
base: mvtools-pfmod
Choose a base branch
from
Open

Fix uninitialized value and memory leak in DePanEstimate #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34721e8
DePanEstimate: initialize first element of 'trust' array
magiblot Dec 30, 2021
5ac94f6
DePanEstimate: allocate 'fftcache2' and 'fftcachecomp2' only when nec…
magiblot Dec 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions DePanEstimate/estimate_fftw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,11 @@ DePanEstimate_fftw::DePanEstimate_fftw(PClip _child, int _range, float _trust, i

fftcache = (fftwf_complex**)fftfp.fftwf_malloc(fftcachecapacity * sizeof(uintptr_t)); // array of pointers x64: int->uintptr_t
if (fftcache == NULL) env->ThrowError("DepanEstimate: FFTW Allocation Failure!\n");
fftcache2 = (fftwf_complex**)fftfp.fftwf_malloc(fftcachecapacity * sizeof(uintptr_t));
fftcachecomp = (fftwf_complex**)fftfp.fftwf_malloc(fftcachecapacity * sizeof(uintptr_t));
fftcachecomp2 = (fftwf_complex**)fftfp.fftwf_malloc(fftcachecapacity * sizeof(uintptr_t));
if (zoommax != 1) {
fftcache2 = (fftwf_complex**)fftfp.fftwf_malloc(fftcachecapacity * sizeof(uintptr_t));
fftcachecomp2 = (fftwf_complex**)fftfp.fftwf_malloc(fftcachecapacity * sizeof(uintptr_t));
}
for (i = 0; i < fftcachecapacity; i++) {
fftcache[i] = (fftwf_complex*)fftfp.fftwf_malloc(sizeof(fftwf_complex) * fftsize);
fftcachecomp[i] = (fftwf_complex*)fftfp.fftwf_malloc(sizeof(fftwf_complex) * fftsize);
Expand Down Expand Up @@ -266,6 +268,7 @@ DePanEstimate_fftw::DePanEstimate_fftw(PClip _child, int _range, float _trust, i
for (i = 1; i < vi.num_frames; i++) {
motionx[i] = MOTIONUNKNOWN; //set motion as unknown for all frames beside 0
}
trust[0] = 0;

// set frame cache
#ifdef AVS_2_5
Expand Down Expand Up @@ -357,7 +360,7 @@ void DePanEstimate_fftw::frame_data2d(const BYTE * srcp0, int height, int src_wi
pitch = pitch / sizeof(pixel_t); // PF

// h0 = (height - winy)/2; // top of fft window

if (isYUY2)
{
srcp += pitch*h0 + winleft * 2; // offset of window data
Expand Down