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

scilab: fix possible crash by using consistent allocation/free methods (use SWIG macros)

Browse source
This commit is contained in:
Simon Marchetto 2015-03-24 16:50:18 +01:00
commit 4c6f29b778
1 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Lib/scilab/scichar.swg
View file

@ -117,8 +117,10 @@ SWIGINTERN int
SWIG_SciString_AsCharPtrAndSize(void *pvApiCtx, int iVar, char **pcValue, size_t *piLength, int *alloc, char *fname) { SWIG_SciString_AsCharPtrAndSize(void *pvApiCtx, int iVar, char **pcValue, size_t *piLength, int *alloc, char *fname) {
SciErr sciErr; SciErr sciErr;
int *piAddrVar = NULL; int *piAddrVar = NULL;
int iRet; char *pstString = NULL;
char *pstStrings = NULL; int iRows = 0;
int iCols = 0;
int iLen = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar); sciErr = getVarAddressFromPosition(pvApiCtx, iVar, &piAddrVar);
if (sciErr.iErr) { if (sciErr.iErr) {
@ -126,14 +128,31 @@ SWIG_SciString_AsCharPtrAndSize(void *pvApiCtx, int iVar, char **pcValue, size_t
return SWIG_ERROR; return SWIG_ERROR;
} }
iRet = getAllocatedSingleString(pvApiCtx, piAddrVar, &pstStrings); if (isScalar(pvApiCtx, piAddrVar) == 0 || isStringType(pvApiCtx, piAddrVar) == 0)
if (iRet) { {
Scierror(SCILAB_API_ARGUMENT_ERROR, _("%s: Wrong type for input argument #%d: A single string expected.\n"), fname, iVar);
return SWIG_TypeError;
}
sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &iLen, NULL);
if (sciErr.iErr)
{
printError(&sciErr, 0);
return SWIG_ERROR;
}
pstString = %new_array(iLen + 1, char);
sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &iLen, &pstString);
if (sciErr.iErr)
{
printError(&sciErr, 0);
return SWIG_ERROR; return SWIG_ERROR;
} }
// TODO: return SWIG_ERROR if pcValue NULL (now returning SWIG_ERROR fails some typechecks) // TODO: return SWIG_ERROR if pcValue NULL (now returning SWIG_ERROR fails some typechecks)
if (pcValue) { if (pcValue) {
*pcValue = pstStrings; *pcValue = pstString;
} }
if (alloc != NULL) { if (alloc != NULL) {
@ -141,7 +160,7 @@ SWIG_SciString_AsCharPtrAndSize(void *pvApiCtx, int iVar, char **pcValue, size_t
} }
if (piLength != NULL) { if (piLength != NULL) {
*piLength = strlen(*pcValue); *piLength = strlen(pstString);
} }
return SWIG_OK; return SWIG_OK;