Skip to content

Fixed an issue where large buffer allocations in filters (> 256MB) causes a segfault #1368

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
implausible merged 4 commits into from
Sep 13, 2017
Merged

Fixed an issue where large buffer allocations in filters (> 256MB) causes a segfault #1368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
572f573
Fixed filter tests to work with massive buffer
cjhoward92 Aug 24, 2017
a7f61ee
Added variable for size and allocUnsafe for large allocations
cjhoward92 Aug 24, 2017
1cb96b4
Updated methods to be shouldAlloc when an allocated buffer is needed
cjhoward92 Sep 6, 2017
658f5b7
32 bit CI does not like 500 meg buffers.
implausible Sep 13, 2017
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
87 changes: 78 additions & 9 deletions generate/input/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@
"out": {
"isReturn": true,
"cppClassName": "GitBuf",
"jsClassName": "Buffer"
"jsClassName": "Buffer",
"shouldAlloc": true
},
"blob": {
"cppClassName": "GitBlob",
Expand Down Expand Up @@ -259,7 +260,8 @@
"isReturn": true,
"cppClassName": "GitBuf",
"jsClassName": "Buffer",
"cType": "git_buf *"
"cType": "git_buf *",
"shouldAlloc": true
},
"repo": {
"cppClassName": "GitRepository",
Expand Down Expand Up @@ -307,9 +309,9 @@
"jsFunctionName": "grow",
"args": {
"buffer": {
"isReturn": true,
"isSelf": false,
"shouldAlloc": true
"isReturn": false,
"isSelf": true,
"shouldAlloc": false
}
},
"return": {
Expand All @@ -324,9 +326,9 @@
"jsFunctionName": "set",
"args": {
"buffer": {
"isReturn": true,
"isSelf": false,
"shouldAlloc": true
"isReturn": false,
"isSelf": true,
"shouldAlloc": false
},
"data": {
"cppClassName": "Buffer",
Expand Down Expand Up @@ -537,6 +539,19 @@
"return": {
"ownedByThis": true
}
},
"git_commit_header_field": {
"isAsync": true,
"args": {
"out": {
"isReturn": true,
"isSelf": false,
"shouldAlloc": true
}
},
"return": {
"isErrorCode": true
}
}
}
},
Expand Down Expand Up @@ -601,6 +616,12 @@
},
"git_config_get_string_buf": {
"isAsync": true,
"args": {
"out": {
"isReturn": true,
"shouldAlloc": true
}
},
"return": {
"isErrorCode": true
}
Expand Down Expand Up @@ -673,6 +694,19 @@
"return": {
"isErrorCode": true
}
},
"git_config_find_programdata": {
"isAsync": true,
"return": {
"isErrorCode": true
},
"args": {
"out": {
"isReturn": true,
"isSelf": false,
"shouldAlloc": true
}
}
}
},
"dependencies": [
Expand Down Expand Up @@ -882,6 +916,19 @@
"git_diff_status_char": {
"ignore": true
},
"git_diff_to_buf": {
"isAsync": true,
"return": {
"isErrorCode": true
},
"args": {
"out": {
"isReturn": true,
"isSelf": false,
"shouldAlloc": true
}
}
},
"git_diff_tree_to_index": {
"args": {
"old_tree": {
Expand Down Expand Up @@ -1968,7 +2015,9 @@
"isAsync": true,
"args": {
"out": {
"isReturn": true
"isReturn": true,
"shouldAlloc": true,
"isSelf": false
},
"remote": {
"isSelf": true
Expand Down Expand Up @@ -2115,6 +2164,13 @@
"isAsync": true,
"return": {
"isErrorCode": true
},
"args": {
"out": {
"isReturn": true,
"isSelf": false,
"shouldAlloc": true
}
}
},
"git_repository_init_init_options": {
Expand Down Expand Up @@ -2478,6 +2534,19 @@
"isErrorCode": true
}
},
"git_submodule_resolve_url": {
"isAsync": true,
"args": {
"out": {
"isReturn": true,
"shouldAlloc": true,
"isSelf": false
}
},
"return": {
"isErrorCode": true
}
},
"git_submodule_update": {
"isAsync": true,
"args": {
Expand Down
14 changes: 3 additions & 11 deletions generate/templates/partials/async_function.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
{%if arg.globalPayload %}
{{ cppFunctionName }}_globalPayload* globalPayload = new {{ cppFunctionName }}_globalPayload;
{%endif%}
{%if arg.cppClassName == "GitBuf" %}
{%if cppFunctionName == "Set"%}
baton->{{arg.name}} = Nan::ObjectWrap::Unwrap<{{ arg.cppClassName }}>(info.This())->GetValue();
{%else%}
baton->{{arg.name}} = ({{ arg.cType }})malloc(sizeof({{ arg.cType|replace '*' '' }}));
baton->{{arg.name}}->ptr = NULL;
baton->{{arg.name}}->size = baton->{{arg.name}}->asize = 0;
{%endif%}
{%endif%}
{%endeach%}

{%each args|argsInfo as arg %}
Expand Down Expand Up @@ -61,9 +52,10 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
{%endif%}
{%endif%}
{%elsif arg.shouldAlloc %}
baton->{{arg.name}} = ({{ arg.cType }})malloc(sizeof({{ arg.cType|replace '*' '' }}));
{%if arg.cppClassName == "GitBuf" %}
{%else%}
baton->{{ arg.name }} = ({{ arg.cType }})malloc(sizeof({{ arg.cType|replace '*' '' }}));
baton->{{arg.name}}->ptr = NULL;
baton->{{arg.name}}->size = baton->{{arg.name}}->asize = 0;
{%endif%}
{%endif%}
{%endeach%}
Expand Down
4 changes: 4 additions & 0 deletions generate/templates/partials/convert_to_v8.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,16 @@

to = tmpArray;
{% elsif cppClassName == 'GitBuf' %}
{% if doNotConvert %}
to = Nan::Null();
{% else %}
if ({{= parsedName =}}) {
to = Nan::New<String>({{= parsedName =}}->ptr, {{= parsedName = }}->size).ToLocalChecked();
}
else {
to = Nan::Null();
}
{% endif %}
{% else %}
{% if copy %}
if ({{= parsedName =}} != NULL) {
Expand Down
Loading