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

as() no longer uses memset and always throws.

Browse source
This commit is contained in:
Mike Romberg 2017-07-20 13:07:59 -06:00
commit a2e3cc0709
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/r/rstdcommon.swg
View file

@ -101,12 +101,11 @@ namespace swig {
template <class Type> template <class Type>
struct traits_as<Type, value_category> { struct traits_as<Type, value_category> {
static Type as(SWIG_Object obj, bool throw_error) { static Type as(SWIG_Object obj) {
Type v; Type v;
int res = asval(obj, &v); int res = asval(obj, &v);
if (!obj || !SWIG_IsOK(res)) { if (!obj || !SWIG_IsOK(res)) {
if (throw_error) throw std::invalid_argument("bad type");
throw std::invalid_argument("bad type");
} }
return v; return v;
} }
@ -114,7 +113,7 @@ namespace swig {
template <class Type> template <class Type>
struct traits_as<Type, pointer_category> { struct traits_as<Type, pointer_category> {
static Type as(SWIG_Object obj, bool throw_error) { static Type as(SWIG_Object obj) {
Type *v = 0; Type *v = 0;
int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR); int res = (obj ? traits_asptr<Type>::asptr(obj, &v) : SWIG_ERROR);
if (SWIG_IsOK(res) && v) { if (SWIG_IsOK(res) && v) {
@ -126,12 +125,7 @@ namespace swig {
return *v; return *v;
} }
} else { } else {
// Uninitialized return value, no Type() constructor required.
static Type *v_def = (Type*) malloc(sizeof(Type));
if (throw_error)
throw std::invalid_argument("bad type"); throw std::invalid_argument("bad type");
memset(v_def,0,sizeof(Type));
return *v_def;
} }
} }
}; };
@ -152,8 +146,8 @@ namespace swig {
}; };
template <class Type> template <class Type>
inline Type as(SWIG_Object obj, bool te = false) { inline Type as(SWIG_Object obj) {
return traits_as<Type, typename traits<Type>::category>::as(obj, te); return traits_as<Type, typename traits<Type>::category>::as(obj);
} }
template <class Type> template <class Type>