Ver código fonte

Fix possible crash on accessing content rect with nullptr surface

Ivan Savenko 7 meses atrás
pai
commit
9da598dcaf
1 arquivos alterados com 4 adições e 3 exclusões
  1. 4 3
      client/renderSDL/SDLImage.cpp

+ 4 - 3
client/renderSDL/SDLImage.cpp

@@ -352,9 +352,10 @@ Rect SDLImageShared::contentRect() const
 	if(upscalingInProgress)
 		throw std::runtime_error("Attempt to access images that is still being loaded!");
 
-	auto tmpMargins = margins;
-	auto tmpSize = Point(surf->w, surf->h);
-	return Rect(tmpMargins, tmpSize);
+	if (!surf)
+		return Rect();
+
+	return Rect(margins, Point(surf->w, surf->h));
 }
 
 const SDL_Palette * SDLImageShared::getPalette() const