소스 검색

Fix possible crash on accessing content rect with nullptr surface

Ivan Savenko 8 달 전
부모
커밋
9da598dcaf
1개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  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