From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 5 Jul 2018 14:27:23 +0000 (+0300)
Subject: Fix image signature comparisons
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=2effe9b416302914a8b8d88c815e20bd874d8100;p=libs%2Fgui.git

Fix image signature comparisons

The standard states that if a length is not given, the character array
must be nul-terminated.
---

diff --git a/source/graphics/bmploader.cpp b/source/graphics/bmploader.cpp
index 71de507..086648b 100644
--- a/source/graphics/bmploader.cpp
+++ b/source/graphics/bmploader.cpp
@@ -41,7 +41,7 @@ bool BmpLoader::detect(const std::string &sig)
 	static const char bmp_sig[] = "BM";
 	if(sig.size()<sizeof(bmp_sig))
 		return false;
-	return !sig.compare(0, 2, bmp_sig);
+	return !sig.compare(0, sizeof(bmp_sig), bmp_sig, sizeof(bmp_sig));
 }
 
 void BmpLoader::load(Image::Data &data)
diff --git a/source/graphics/jpeg/jpegloader.cpp b/source/graphics/jpeg/jpegloader.cpp
index b580156..bc0f2df 100644
--- a/source/graphics/jpeg/jpegloader.cpp
+++ b/source/graphics/jpeg/jpegloader.cpp
@@ -116,7 +116,7 @@ bool JpegLoader::detect(const string &sig)
 	static const char jpeg_sig[] = { '\xFF', '\xD8', '\xFF' };
 	if(sig.size()<sizeof(jpeg_sig))
 		return false;
-	return !sig.compare(0, sizeof(jpeg_sig), jpeg_sig);
+	return !sig.compare(0, sizeof(jpeg_sig), jpeg_sig, sizeof(jpeg_sig));
 }
 
 void JpegLoader::load(Image::Data &data)