summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Andersson <j.a.e.andersson@gmail.com>2016-11-09 08:24:11 -0600
committerGitHub <noreply@github.com>2016-11-09 08:24:11 -0600
commit989d8d6a49cdbfe14e65d6179ef9c43bf14cacf2 (patch)
tree4922612b622c10aef9db6062bbef3e3e8c774c55
parent04a02f12fcf324fc09f2fab96dac01bb8bb71ef8 (diff)
parent0c1a20a8cbc24da54777f5e7170645bba0a02124 (diff)
downloadswig-989d8d6a49cdbfe14e65d6179ef9c43bf14cacf2.tar.gz
Merge pull request #76 from Alzathar/matlab-empty-string
The Matlab empty string ('') is not recognized as a valid string.
-rw-r--r--Lib/matlab/matlabprimtypes.swg2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/matlab/matlabprimtypes.swg b/Lib/matlab/matlabprimtypes.swg
index acb70a434..73d5cce37 100644
--- a/Lib/matlab/matlabprimtypes.swg
+++ b/Lib/matlab/matlabprimtypes.swg
@@ -230,7 +230,7 @@ SWIG_AsVal_dec(bool)(mxArray* pm, bool *val)
SWIGINTERN int
SWIG_AsCharPtrAndSize(mxArray* pm, char** cptr, size_t* psize, int *alloc)
{
- if(!mxIsChar(pm) || mxGetM(pm)!=1) return SWIG_TypeError;
+ if(!mxIsChar(pm) || (mxGetNumberOfElements(pm) != 0 && mxGetM(pm)!=1)) return SWIG_TypeError;
size_t len=mxGetN(pm);
static char buf[256];
int flag = mxGetString(pm,buf,(mwSize)sizeof(buf));