Skip to content

This fixes multiple major memory leaks #10

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

Merged
gperrow-SAP merged 1 commit into from
Jan 11, 2016
Merged

This fixes multiple major memory leaks #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 22 additions & 9 deletions src/sqlanywhere.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ struct executeBaton {
CLEAN_NUMS( int_vals );
CLEAN_NUMS( string_len );
col_types.clear();
callback.Reset();

for( size_t i = 0; i < params.size(); i++ ) {
if( params[i].value.is_null != NULL ) {
Expand Down Expand Up @@ -180,6 +181,7 @@ void executeAfter( uv_work_t *req )
executeBaton *baton = static_cast<executeBaton*>( req->data );
Persistent<Value> ResultSet;
fillResult( baton, ResultSet );
ResultSet.Reset();

scoped_lock lock( baton->obj->conn_mutex );

Expand All @@ -197,7 +199,7 @@ void executeAfter( uv_work_t *req )
NODE_API_FUNC( StmtObject::exec )
/*******************************/
{
Isolate *isolate = args.GetIsolate();
Isolate *isolate = args.GetIsolate();
HandleScope scope( isolate );
StmtObject *obj = ObjectWrap::Unwrap<StmtObject>( args.This() );
int num_args = args.Length();
Expand Down Expand Up @@ -279,6 +281,8 @@ NODE_API_FUNC( StmtObject::exec )
return;
}
args.GetReturnValue().Set( ResultSet );

ResultSet.Reset();
}


Expand Down Expand Up @@ -352,15 +356,15 @@ NODE_API_FUNC( Connection::exec )
req->data = baton;

if( callback_required ) {
Local<Function> callback = Local<Function>::Cast(args[cbfunc_arg]);
baton->callback.Reset( isolate, callback );
int status;
status = uv_queue_work( uv_default_loop(), req, executeWork,
(uv_after_work_cb)executeAfter );
assert(status == 0);
Local<Function> callback = Local<Function>::Cast(args[cbfunc_arg]);
baton->callback.Reset( isolate, callback );
int status;
status = uv_queue_work( uv_default_loop(), req, executeWork,
(uv_after_work_cb)executeAfter );
assert(status == 0);

args.GetReturnValue().SetUndefined();
return;
args.GetReturnValue().SetUndefined();
return;
}

Persistent<Value> ResultSet;
Expand All @@ -381,6 +385,8 @@ NODE_API_FUNC( Connection::exec )
}
Local<Value> local_result = Local<Value>::New( isolate, ResultSet );
args.GetReturnValue().Set( local_result );

ResultSet.Reset();
}

struct prepareBaton {
Expand All @@ -401,6 +407,8 @@ struct prepareBaton {

~prepareBaton() {
obj = NULL;
callback.Reset();
StmtObj.Reset();
}
};

Expand Down Expand Up @@ -494,6 +502,7 @@ NODE_API_FUNC( Connection::prepare )
getErrorMsg( JS_ERR_GENERAL_ERROR, error_msg );
callBack( &( error_msg ), args[cbfunc_arg], undef, callback_required );
args.GetReturnValue().SetUndefined();
p_stmt.Reset();
return;
}

Expand All @@ -517,6 +526,7 @@ NODE_API_FUNC( Connection::prepare )
assert(status == 0);

args.GetReturnValue().SetUndefined();
p_stmt.Reset();
return;
}

Expand All @@ -529,6 +539,7 @@ NODE_API_FUNC( Connection::prepare )
return;
}
args.GetReturnValue().Set( p_stmt );
p_stmt.Reset();
}


Expand Down Expand Up @@ -556,6 +567,7 @@ struct connectBaton {
~connectBaton() {
obj = NULL;
sqlca = NULL;
callback.Reset();
}

};
Expand Down Expand Up @@ -979,6 +991,7 @@ struct dropBaton {

~dropBaton() {
obj = NULL;
callback.Reset();
}
};

Expand Down