BACKENDS: SDL: Do not allocate memory in SurfaceSdlGraphicsManager::getSupportedGraphicsModes

backends/graphics/surfacesdl/surfacesdl-graphics.cpp

@@ -300,27 +300,8 @@ static void initGraphicsModes() {
 	s_supportedGraphicsModes->push_back(gm);
 }
 
-const OSystem::GraphicsMode *SurfaceSdlGraphicsManager::supportedGraphicsModes() const {
-	if (!s_supportedGraphicsModes)
-		initGraphicsModes();
-
-	int size = s_supportedGraphicsModes->size();
-	OSystem::GraphicsMode *modes = new OSystem::GraphicsMode[size];
-	memcpy(modes, &(*s_supportedGraphicsModes)[0], size * sizeof(OSystem::GraphicsMode));
-
-	// Do deep copy. Each can be freed independently of the other.
-	OSystem::GraphicsMode *gm = modes;
-	while (gm->name) {
-		gm->name = scumm_strdup(gm->name);
-		gm->description = scumm_strdup(gm->description);
-		++gm;
-	}
-
-	return modes;
-}
-
 const OSystem::GraphicsMode *SurfaceSdlGraphicsManager::getSupportedGraphicsModes() const {
-	return supportedGraphicsModes();
+	return s_supportedGraphicsModes->begin();
 }
 
 int SurfaceSdlGraphicsManager::getDefaultGraphicsMode() const {

backends/graphics/surfacesdl/surfacesdl-graphics.h

@@ -65,7 +65,6 @@ public:
 	virtual void setFeatureState(OSystem::Feature f, bool enable) override;
 	virtual bool getFeatureState(OSystem::Feature f) const override;
 
-	const OSystem::GraphicsMode *supportedGraphicsModes() const;
 	virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const override;
 	virtual int getDefaultGraphicsMode() const override;
 	virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags) override;

backends/platform/sdl/sdl.cpp

@@ -857,22 +857,24 @@ void OSystem_SDL::setupGraphicsModes() {
 	_defaultSDLMode = _defaultGLMode = -1;
 
 	// Count the number of graphics modes
-	const OSystem::GraphicsMode *srcModes;
 	const OSystem::GraphicsMode *srcMode;
 	int defaultMode;
 
 	GraphicsManager *manager = new SurfaceSdlGraphicsManager(_eventSource, _window);
 	defaultMode = manager->getDefaultGraphicsMode();
-	srcModes = manager->getSupportedGraphicsModes();
+	srcMode = manager->getSupportedGraphicsModes();
-	srcMode = srcModes;
 	while (srcMode->name) {
 		if (defaultMode == srcMode->id) {
 			_defaultSDLMode = _graphicsModes.size();
 		}
-		_graphicsModes.push_back(*srcMode);
+		OSystem::GraphicsMode mode = *srcMode;
+		// Do deep copy as we are going to delete the GraphicsManager and this may free
+		// the memory used for its graphics modes.
+		mode.name = scumm_strdup(srcMode->name);
+		mode.description = scumm_strdup(srcMode->description);
+		_graphicsModes.push_back(mode);
 		srcMode++;
 	}
-	delete[] srcModes;
 	delete manager;
 	assert(_defaultSDLMode != -1);
 
@@ -884,7 +886,12 @@ void OSystem_SDL::setupGraphicsModes() {
 		if (defaultMode == srcMode->id) {
 			_defaultGLMode = _graphicsModes.size();
 		}
-		_graphicsModes.push_back(*srcMode);
+		OSystem::GraphicsMode mode = *srcMode;
+		// Do deep copy as we are going to delete the GraphicsManager and this may free
+		// the memory used for its graphics modes.
+		mode.name = scumm_strdup(srcMode->name);
+		mode.description = scumm_strdup(srcMode->description);
+		_graphicsModes.push_back(mode);
 		srcMode++;
 	}
 	delete manager;
@@ -907,14 +914,11 @@ void OSystem_SDL::setupGraphicsModes() {
 
 void OSystem_SDL::clearGraphicsModes() {
 	if (!_graphicsModes.empty()) {
-		int i = 0;
-
 		OSystem::GraphicsMode *mode = _graphicsModes.begin();
-		while (mode->name && i < _firstGLMode) {
+		while (mode->name) {
 			free(const_cast<char *>(mode->name));
 			free(const_cast<char *>(mode->description));
 			mode++;
-			i++;
 		}
 		_graphicsModes.clear();
 	}