Mercurial > hg > octave-lyh
diff scripts/testfun/test.m @ 14066:80bda7c4f012 stable
Avoid segfault in test() and demo() blocks with embedded functions (Bugs #35068, #32843, #33981)
* test.m, demo.m: Search code block to be executed for any embedded functions.
Return an error if any functions found without executing the code block to
avoid segmentation fault.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Sun, 18 Dec 2011 18:15:18 -0800 |
| parents | 4b1ce071f504 |
| children | 72c96de7a403 |
line wrap: on
line diff
--- a/scripts/testfun/test.m +++ b/scripts/testfun/test.m @@ -491,9 +491,17 @@ ## evaluate code for test, shared, and assert. if (! isempty(__code)) try - eval (sprintf ("function %s__test__(%s)\n%s\nendfunction", - __shared_r,__shared, __code)); - eval (sprintf ("%s__test__(%s);", __shared_r, __shared)); + ## FIXME: need to check for embedded test functions, which cause + ## segfaults, until issues with subfunctions in functions are resolved. + embed_func = regexp (__code, '^\s*function ', 'once', 'lineanchors'); + if (isempty (embed_func)) + eval (sprintf ("function %s__test__(%s)\n%s\nendfunction", + __shared_r,__shared, __code)); + eval (sprintf ("%s__test__(%s);", __shared_r, __shared)); + else + error (["Functions embedded in %!test blocks are not allowed.\n", ... + "Use the %!function/%!endfunction syntax instead to define shared functions for testing.\n"]); + endif catch if (strcmp (__type, "xtest")) __msg = sprintf ("%sknown failure\n%s", __signal_fail, lasterr ());