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

scilab: check overflow in array typemaps

Browse source
This commit is contained in:
Simon Marchetto 2014-03-11 15:46:47 +01:00
commit 38cd5bd405
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Examples/test-suite/scilab/arrays_global_runme.sci
View file

@ -40,6 +40,9 @@ testArray("array_d", array_d_set, array_d_get, [-10.5, 20.4], [-10.5, 20.4]);
if array_const_i_get() <> [10, 20] then swigtesterror(); end if array_const_i_get() <> [10, 20] then swigtesterror(); end
ierr = execstr('array_i_set([0:10]', 'errcatch');
if ierr == 0 then swigtesterror("Overflow error expected"); end
if BeginString_FIX44a_get() <> "FIX.a.a" then swigtesterror(); end if BeginString_FIX44a_get() <> "FIX.a.a" then swigtesterror(); end
if BeginString_FIX44b_get() <> "FIX.b.b" then swigtesterror(); end if BeginString_FIX44b_get() <> "FIX.b.b" then swigtesterror(); end
if BeginString_FIX44c_get() <> "FIX.c.c" then swigtesterror(); end if BeginString_FIX44c_get() <> "FIX.c.c" then swigtesterror(); end

19
Lib/scilab/sciarray.swg
View file

@ -4,6 +4,10 @@
* *
* --------------------------------------------------------------------------*/ * --------------------------------------------------------------------------*/
%{
#include <stdio.h>
%}
%define %scilab_asarray_withcopy(TYPEMAPTYPE, FRAGMENTNAME, CTYPE, TEMPDATATYPE) %define %scilab_asarray_withcopy(TYPEMAPTYPE, FRAGMENTNAME, CTYPE, TEMPDATATYPE)
%typemap(TYPEMAPTYPE, fragment="FRAGMENTNAME") CTYPE { %typemap(TYPEMAPTYPE, fragment="FRAGMENTNAME") CTYPE {
size_t i = 0; size_t i = 0;
@ -21,16 +25,23 @@
%enddef %enddef
%define %scilab_asarrayandsize_withcopy(TYPEMAPTYPE, FRAGMENTNAME, CTYPE, TEMPDATATYPE) %define %scilab_asarrayandsize_withcopy(TYPEMAPTYPE, FRAGMENTNAME, CTYPE, TEMPDATATYPE)
%typemap(TYPEMAPTYPE, fragment="FRAGMENTNAME") CTYPE { %typemap(TYPEMAPTYPE, fragment="FRAGMENTNAME") CTYPE {
size_t i = 0;
int iRows = 0; int iRows = 0;
int iCols = 0; int iCols = 0;
TEMPDATATYPE *pTempData = NULL; TEMPDATATYPE *pTempData = NULL;
if (FRAGMENTNAME(pvApiCtx, $input, &iRows, &iCols, &pTempData, fname)) { if (FRAGMENTNAME(pvApiCtx, $input, &iRows, &iCols, &pTempData, fname)) {
return SWIG_ERROR; return SWIG_ERROR;
} }
// TODO: add check to be sure iRows*iCols==$1_dim0 if (iRows*iCols <= $1_dim0) {
for (i = 0; i < $1_dim0; i++) { size_t i;
$1[i] = ($*1_ltype) pTempData[i]; for (i = 0; i < $1_dim0; i++) {
$1[i] = ($*1_ltype) pTempData[i];
}
}
else {
char errmsg[100];
sprintf(errmsg, "Size of input data (%d) is too big (maximum is %d)",
iRows*iCols, $1_dim0);
SWIG_exception_fail(SWIG_OverflowError, errmsg);
} }
} }
%enddef %enddef