diff options
| author | Paul Gilbert | 2017-09-13 22:31:35 -0400 |
|---|---|---|
| committer | Colin Snover | 2017-10-15 19:03:09 -0500 |
| commit | 17606700c49b056b655f1d7e3d4a39c707520f24 (patch) | |
| tree | 4b06316f2e706fdf17feb36ddc981e6aad2174d1 | |
| parent | db5676fec2410a8843302225948f12e9d778cccc (diff) | |
| download | scummvm-rg350-17606700c49b056b655f1d7e3d4a39c707520f24.tar.gz scummvm-rg350-17606700c49b056b655f1d7e3d4a39c707520f24.tar.bz2 scummvm-rg350-17606700c49b056b655f1d7e3d4a39c707520f24.zip | |
TITANIC: Fix use after free and remove IFDEF code from mouse cursors
| -rw-r--r-- | engines/titanic/support/mouse_cursor.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/engines/titanic/support/mouse_cursor.cpp b/engines/titanic/support/mouse_cursor.cpp index d9a357819a..21b425834e 100644 --- a/engines/titanic/support/mouse_cursor.cpp +++ b/engines/titanic/support/mouse_cursor.cpp @@ -81,9 +81,9 @@ void CMouseCursor::loadCursorImages() { CVideoSurface *surface = _screenManager->createSurface(CURSOR_SIZE, CURSOR_SIZE); // Open the cursors video and move to the given frame - OSMovie movie(key, surface); - movie.setFrame(idx); - Graphics::ManagedSurface *transSurface = movie.duplicateTransparency(); + OSMovie *movie = new OSMovie(key, surface); + movie->setFrame(idx); + Graphics::ManagedSurface *transSurface = movie->duplicateTransparency(); // Create a managed surface to hold the RGBA version of the cursor Graphics::PixelFormat rgbaFormat(4, 8, 8, 8, 8, 24, 16, 8, 0); @@ -103,6 +103,7 @@ void CMouseCursor::loadCursorImages() { *destP = (*destP & ~0xff) | *srcP; } + delete movie; delete transSurface; delete surface; } @@ -151,18 +152,8 @@ void CMouseCursor::setCursor(CursorId cursorId) { _cursorId = cursorId; // Set the cursor - #ifdef RGBA_CURSORS CursorMan.replaceCursor(ce._surface->getPixels(), CURSOR_SIZE, CURSOR_SIZE, ce._centroid.x, ce._centroid.y, 0, false, &ce._surface->format); - #else - const Graphics::Surface &surf = *ce._surface; - Graphics::Surface *s = surf.convertTo(g_system->getScreenFormat()); - - CursorMan.replaceCursor(s->getPixels(), CURSOR_SIZE, CURSOR_SIZE, - ce._centroid.x, ce._centroid.y, 0, false, &s->format); - - delete s; - #endif } } |