jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix v8 string conversion in case of null arguments.

Browse source
This commit is contained in:
Oliver Buchtala 2013-01-25 14:07:06 +01:00
commit 65560a8664
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Lib/javascript/v8/std_string.i
View file

@ -14,19 +14,22 @@
%fragment("SWIGV8_valueToString", "header", fragment="SWIG_AsCharPtrAndSize") { %fragment("SWIGV8_valueToString", "header", fragment="SWIG_AsCharPtrAndSize") {
std::string* SWIGV8_valueToStringPtr(v8::Handle<v8::Value> val) { std::string* SWIGV8_valueToStringPtr(v8::Handle<v8::Value> val) {
if (!val->IsString()) return 0;
int alloc; int alloc;
size_t size; size_t size;
char* chars; char* chars;
int res = SWIG_AsCharPtrAndSize(val, &chars, &size, &alloc); int res = SWIG_AsCharPtrAndSize(val, &chars, &size, &alloc);
if(res != SWIG_OK) { if(res != SWIG_OK) {
v8::ThrowException(v8::Exception::TypeError(v8::String::New("Could not convert to string."))); v8::ThrowException(v8::Exception::TypeError(v8::String::New("Could not convert to string.")));
return 0; return 0;
} }
// copies the data (again) // copies the data (again)
std::string *str = new std::string(chars); std::string *str = new std::string(chars);
if (alloc) delete[] chars; if (alloc) delete[] chars;
return str; return str;
@ -45,20 +48,22 @@ namespace std {
class string; class string;
%typemap(in, fragment="SWIGV8_valueToString") string (std::string* tmp) %typemap(in, fragment="SWIGV8_valueToString") string (std::string* tmp)
%{ %{
tmp = SWIGV8_valueToStringPtr($input); tmp = SWIGV8_valueToStringPtr($input);
$1 = *tmp; $1 = *tmp;
delete tmp; if (tmp == 0) { v8::ThrowException(v8::Exception::TypeError(v8::String::New("Null pointer."))); goto fail; }
if (tmp) delete tmp;
%} %}
%typemap(in, fragment="SWIGV8_valueToString") const string & %typemap(in, fragment="SWIGV8_valueToString") const string &
%{ %{
$1 = SWIGV8_valueToStringPtr($input); $1 = SWIGV8_valueToStringPtr($input);
if ($1 == 0) { v8::ThrowException(v8::Exception::TypeError(v8::String::New("Null pointer."))); goto fail; }
%} %}
%typemap(freearg) const string & %typemap(freearg) const string &
%{ %{
delete $1; if ($1) delete $1;
%} %}
%typemap(out, fragment="SWIGV8_stringToValue") string %typemap(out, fragment="SWIGV8_stringToValue") string