Backgrounds: FlattenedSize() can be negative (error status)

CID 610928.
haiku · Jul 2, 2015 · 02ab820 · 02ab820
1 parent 24b1f93
commit 02ab820
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/preferences/backgrounds/BackgroundImage.cpp b/src/preferences/backgrounds/BackgroundImage.cpp
@@ -494,7 +494,10 @@ BackgroundImage::SetBackgroundImage(BNode* node)
 
 	PRINT_OBJECT(container);
 
-	size_t flattenedSize = container.FlattenedSize();
+	ssize_t flattenedSize = container.FlattenedSize();
+	if (flattenedSize < B_OK)
+		return flattenedSize;
+
 	char* buffer = new(std::nothrow) char[flattenedSize];
 	if (buffer == NULL)
 		return B_NO_MEMORY;
@@ -511,7 +514,7 @@ BackgroundImage::SetBackgroundImage(BNode* node)
 
 	if (size < B_OK)
 		return size;
-	if ((size_t)size != flattenedSize)
+	if (size != flattenedSize)
 		return B_ERROR;
 
 	return B_OK;