archive-gh-me/node-opencv
1
0
Fork 0
mirror of https://github.com/peterbraden/node-opencv.git synced 2025-12-08 19:45:55 +00:00
Code Issues Projects Releases Wiki Activity

resize: delete the dest we created on error, and if still present on destructor

Browse Source
This commit is contained in:
Simon Hailes 2017-11-10 10:25:27 +00:00
parent ab0bd505d2
commit f2c05255a0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Matrix.cc
View File

@ -1899,10 +1899,14 @@ public:
fx(fx),
fy(fy),
interpolation(interpolation),
success(0){
success(0),
dest(null){
}
~ResizeASyncWorker() {
// don't leave this if it was allocated
// could happen if NaN does not call HandleSuccess?
delete dest;
}
void Execute() {
@ -1924,8 +1928,7 @@ public:
Matrix *img = Nan::ObjectWrap::Unwrap<Matrix>(im_to_return);
img->mat = dest->mat;
delete dest;
//delete dest;
dest = null;
Local<Value> argv[] = {
Nan::Null(), // err
@ -1938,6 +1941,8 @@ public:
Nan::FatalException(try_catch);
}
} catch (...){
delete dest;
dest = null;
Local<Value> argv[] = {
Nan::New("C++ exception wrapping response").ToLocalChecked(), // err
Nan::Null() // result
@ -1951,6 +1956,7 @@ public:
}
} else {
delete dest;
dest = null;
Local<Value> argv[] = {
Nan::New("C++ exception").ToLocalChecked(), // err