diff options
| author | Michael Meskes <meskes@debian.org> | 2009-11-19 17:48:11 +0100 |
|---|---|---|
| committer | Michael Meskes <meskes@debian.org> | 2009-11-19 17:48:11 +0100 |
| commit | fd892711c6bdc0ef96b6b3ea13b668cb2a38196e (patch) | |
| tree | e6ec126da2bcd6a490d5661118630edf983580ec /src/VBox/Main/ConsoleImpl.cpp | |
| parent | 8dc3a7e38d0783262b1aa8c3462e7359d8996d98 (diff) | |
| parent | b35715c68a1bec309bc1990353e35c20a21d5c47 (diff) | |
| download | virtualbox-debian/3.0.10-dfsg-2bpo50+1.tar.gz | |
Merge branch 'master' into lennydebian/3.0.10-dfsg-2bpo50+1
Conflicts:
debian/changelog
Diffstat (limited to 'src/VBox/Main/ConsoleImpl.cpp')
| -rw-r--r-- | src/VBox/Main/ConsoleImpl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/VBox/Main/ConsoleImpl.cpp b/src/VBox/Main/ConsoleImpl.cpp index 8f86b10eb..f93ff1ffe 100644 --- a/src/VBox/Main/ConsoleImpl.cpp +++ b/src/VBox/Main/ConsoleImpl.cpp @@ -1273,6 +1273,10 @@ STDMETHODIMP Console::COMGETTER(Machine) (IMachine **aMachine) /* mMachine is constant during life time, no need to lock */ mMachine.queryInterfaceTo (aMachine); + /* callers expect to get a valid reference, better fail than crash them */ + if (mMachine.isNull()) + return E_FAIL; + return S_OK; } |