8000 Switch from strdup to memcpy to faithfully copy all bytes and prevent a crash in some cases. by tylerchurch · Pull Request #966 · nodegit/nodegit · GitHub
[go: up one dir, main page]
Skip to content

Switch from strdup to memcpy to faithfully copy all bytes and prevent a crash in some cases. #966

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
johnhaley81 merged 2 commits into from
Mar 24, 2016
Merged

Switch from strdup to memcpy to faithfully copy all bytes and prevent a crash in some cases. #966

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74e85a5
Switch from strdup to memcpy to faithfully copy all bytes and prevent…
tylerc Mar 24, 2016
c866391
Add some comments explaining the switch between strdup and malloc/mem…
tylerc Mar 24, 2016
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
18 changes: 16 additions & 2 deletions generate/templates/partials/convert_from_v8.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@
{%if cppClassName == 'String'%}

String::Utf8Value {{ name }}(info[{{ jsArg }}]->ToString());
from_{{ name }} = ({{ cType }}) strdup(*{{ name }});
// malloc with one extra byte so we can add the terminating null character C-strings expect:
from_{{ name }} = ({{ cType }}) malloc({{ name }}.length() + 1);
// copy the characters from the nodejs string into our C-string (used instead of strdup or strcpy because nulls in
// the middle of strings are valid coming from nodejs):
memcpy((void *)from_{{ name }}, *{{ name }}, {{ name }}.length());
// ensure the final byte of our new string is null, extra casts added to ensure compatibility with various C types
// used in the nodejs binding generation:
memset((void *)(((char *)from_{{ name }}) + {{ name }}.length()), 0, 1);
{%elsif cppClassName == 'GitStrarray' %}

from_{{ name }} = StrArrayConverter::Convert(info[{{ jsArg }}]);
Expand All @@ -24,7 +31,14 @@
{%elsif cppClassName == 'Wrapper'%}

String::Utf8Value {{ name }}(info[{{ jsArg }}]->ToString());
from_{{ name }} = ({{ cType }}) strdup(*{{ name }});
// malloc with one extra byte so we can add the terminating null character C-strings expect:
from_{{ name }} = ({{ cType }}) malloc({{ name }}.length() + 1);
// copy the characters from the nodejs string into our C-string (used instead of strdup or strcpy because nulls in
// the middle of strings are valid coming from nodejs):
memcpy((void *)from_{{ name }}, *{{ name }}, {{ name }}.length());
// ensure the final byte of our new string is null, extra casts added to ensure compatibility with various C types
// used in the nodejs binding generation:
memset((void *)(((char *)from_{{ name }}) + {{ name }}.length()), 0, 1);
{%elsif cppClassName == 'Array'%}

Array *tmp_{{ name }} = Array::Cast(*info[{{ jsArg }}]);
Expand Down
0