Skip to content

Free the non-blocking error array before a raise #613

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
navidemad wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Free the non-blocking error array before a raise #613

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## (unreleased)

* Free the errors that a non-blocking call collects before the extension raises them. Each SQL Server error no longer leaks about 4 KB of native memory.

## 3.4.1

* Register the C globals that hold Ruby classes and modules with the GC, so raising `TinyTds::Error` after GC compaction no longer crashes with a segmentation fault. Fixes #608.
Expand Down
25 changes: 18 additions & 7 deletions ext/tiny_tds/result.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,16 +121,29 @@ static void nogvl_cleanup(DBPROCESS *client)
exceptions based on errors from SQL Server.
*/
short int i;
short int errors_length = userdata->nonblocking_errors_length;

for (i = 0; i < userdata->nonblocking_errors_length; i++) {
tinytds_errordata error = userdata->nonblocking_errors[i];
/*
A raise longjmps out of this function and skips the code after it.
Free the malloc'd array first. If an error is raised, the GC frees the copy.
*/
VALUE errors_buffer;
tinytds_errordata *errors = ALLOCV_N(tinytds_errordata, errors_buffer, errors_length);
MEMCPY(errors, userdata->nonblocking_errors, tinytds_errordata, errors_length);
free(userdata->nonblocking_errors);
userdata->nonblocking_errors = NULL;
userdata->nonblocking_errors_length = 0;
userdata->nonblocking_errors_size = 0;

for (i = 0; i < errors_length; i++) {
tinytds_errordata error = errors[i];

// lookahead to drain any info messages ahead of raising error
if (!error.is_message) {
short int j;

for (j = i; j < userdata->nonblocking_errors_length; j++) {
tinytds_errordata msg_error = userdata->nonblocking_errors[j];
for (j = i; j < errors_length; j++) {
tinytds_errordata msg_error = errors[j];

if (msg_error.is_message) {
rb_tinytds_raise_error(client, msg_error);
Expand All @@ -141,9 +154,7 @@ static void nogvl_cleanup(DBPROCESS *client)
rb_tinytds_raise_error(client, error);
}

free(userdata->nonblocking_errors);
userdata->nonblocking_errors_length = 0;
userdata->nonblocking_errors_size = 0;
ALLOCV_END(errors_buffer);
}

static RETCODE nogvl_dbsqlok(DBPROCESS *client)
Expand Down
Loading