Mercurial > octave
changeset 22101:4e770056f74a
don't attempt to access intepreter before it is ready (bug #48494)
* octave.cc (application::interactive): Avoid dereferencing
m_interpreter if it is 0.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 13 Jul 2016 13:36:36 -0400 |
| parents | 67a5341edf15 |
| children | 3b2198c3013b |
| files | libinterp/octave.cc |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave.cc Tue Jul 12 17:00:51 2016 -0700 +++ b/libinterp/octave.cc Wed Jul 13 13:36:36 2016 -0400 @@ -344,7 +344,10 @@ void application::interactive (bool arg) { - m_interpreter->interactive (arg); + interpreter *interp = instance->m_interpreter; + + if (interp) + interp->interactive (arg); } bool application::forced_interactive (void) @@ -354,7 +357,9 @@ bool application::interactive (void) { - return instance->m_interpreter->interactive (); + interpreter *interp = instance->m_interpreter; + + return interp ? interp->interactive () : false; } application::~application (void)