From: Jeff E. <gi...@gi...> - 2010-09-26 20:55:16
|
axis: fix rs274 bug that led to crash in touch off Commit a38f709 changed the message NCE_UNABLE_TO_OPEN_FILE to include the filename that couldn't be opened, but missed adding the filename as an argument at one site where that error message was used. This led to a frequent crash in axis when touching off (e.g., start configs/sim/axis, press F1 F2 END -) and possibly other crashes. http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=7c72911 --- src/emc/rs274ngc/rs274ngc_pre.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/emc/rs274ngc/rs274ngc_pre.cc b/src/emc/rs274ngc/rs274ngc_pre.cc index 275eb1a..7c7da10 100644 --- a/src/emc/rs274ngc/rs274ngc_pre.cc +++ b/src/emc/rs274ngc/rs274ngc_pre.cc @@ -728,7 +728,7 @@ int Interp::open(const char *filename) //!< string: the name of the input NC-pro CHKS((_setup.file_pointer != NULL), NCE_A_FILE_IS_ALREADY_OPEN); CHKS((strlen(filename) > (LINELEN - 1)), NCE_FILE_NAME_TOO_LONG); _setup.file_pointer = fopen(filename, "r"); - CHKS((_setup.file_pointer == NULL), NCE_UNABLE_TO_OPEN_FILE); + CHKS((_setup.file_pointer == NULL), NCE_UNABLE_TO_OPEN_FILE, filename); line = _setup.linetext; for (index = -1; index == -1;) { /* skip blank lines */ CHKS((fgets(line, LINELEN, _setup.file_pointer) == |