6 files changed, 46 insertions, 6 deletions
diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 566d82405a..7118eb682d 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -1149,6 +1149,25 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 		SCI_VERSION_1
 	},
 
+	// King's Quest 5 - French DOS Floppy (from the King's Quest Collector's Edition 1994)
+	// Supplied by aroenai in bug report #2812611
+	// VERSION file reports "1.000", SCI interpreter version 1.000.784
+	{{"kq5", "", {
+		{"resource.map", 0, "eb7853832f3bb10900b13b421a0bbe7f", 8283},
+		{"resource.000", 0, "f063775b279208c14a83eda47073be90", 332806},
+		{"resource.001", 0, "3e6add38564250fd1a5bb10593007530", 1136827},
+		{"resource.002", 0, "d9a97a9cf6c79bbe8f19378f6dea45d5", 1343738},
+		{"resource.003", 0, "bef90d755076c110e67ee3e635503f82", 1324811},
+		{"resource.004", 0, "c14dbafcfbe00855ac6b2f2701058047", 1332216},
+		{"resource.005", 0, "f4b31cafc5defac75125c5f7b7f9a31a", 1268334},
+		{"resource.006", 0, "f7dc85307632ef657ceb1651204f6f51", 1210081},
+		{"resource.007", 0, "7db4d0a1d8d547c0019cb7d2a6acbdd4", 1338473},
+		{NULL, 0, NULL, 0}}, Common::FR_FRA, Common::kPlatformPC, 0, GUIO_NOSPEECH},
+		0,
+		SCI_VERSION_AUTODETECT,
+		SCI_VERSION_1
+	},
+
 	// King's Quest 5 - Italian DOS Floppy (from glorifindel)
 	// SCI interpreter version 1.000.060
 	{{"kq5", "", {
@@ -2203,6 +2222,17 @@ static const struct SciGameDescription SciGameDescriptions[] = {
 	},
 #endif // ENABLE_SCI32
 
+	// Pepper's Adventure In Time 1.000 English
+	// Executable scanning reports "1.001.072", VERSION file reports "1.000"
+	{{"pepper", "", {
+		{"resource.map", 0, "72726dc81c1b4c1110c486be77369bc8", 5179},
+		{"resource.000", 0, "670d0c53622429f4b11275caf7f8d292", 5459574},
+		{NULL, 0, NULL, 0}}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO_NOSPEECH},
+		0,
+		SCI_VERSION_AUTODETECT,
+		SCI_VERSION_1_1
+	},
+
 	// Pepper - English DOS Non-Interactive Demo
 	// Executable scanning reports "1.001.060", VERSION file reports "1.000"
 	{{"pepper", "Demo", {
diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp
index b8c005b620..cd5b1be431 100644
--- a/engines/sci/gfx/gfx_resmgr.cpp
+++ b/engines/sci/gfx/gfx_resmgr.cpp
@@ -341,7 +341,7 @@ gfxr_pic_t *GfxResManager::getPic(int num, int maps, int flags, int default_pale
 	res = resMap.contains(num) ? resMap[num] : NULL;
 
 	if (!res || res->mode != hash) {
-		gfxr_pic_t *pic;
+		gfxr_pic_t *pic = NULL;
 		gfxr_pic_t *unscaled_pic = NULL;
 
 #ifdef CUSTOM_GRAPHICS_OPTIONS
diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h
index fc4e0b3d6f..5cd5d018cc 100644
--- a/engines/sci/gfx/gfx_resmgr.h
+++ b/engines/sci/gfx/gfx_resmgr.h
@@ -270,8 +270,7 @@ public:
 	/**
 	 * Retrieves a color from the static palette
 	 */
-	const PaletteEntry &getColor(int color)
-	{
+	const PaletteEntry &getColor(int color) {
 		return _staticPalette->getColor(color);
 	}
 
@@ -313,6 +312,11 @@ public:
 		return _staticPalette ? _staticPalette->size() : 0;
 	}
 
+	/**
+	 * Returns the resource version that the resource manager is using
+	 */
+	int getVersion() { return _version; }
+
 private:
 	int _version;
 	gfx_options_t *_options;
diff --git a/engines/sci/gfx/gfx_system.h b/engines/sci/gfx/gfx_system.h
index fe93922e21..0f5292aedf 100644
--- a/engines/sci/gfx/gfx_system.h
+++ b/engines/sci/gfx/gfx_system.h
@@ -192,7 +192,7 @@ struct gfx_pixmap_t {
 	 * As a special exception, 256 colors are allowed for background pictures
 	 * (which do not use transparency)
 	 */
-	int colors_nr() const { return palette ? palette->size() : 0; }
+	int colors_nr() const { return palette ? MIN<int>(palette->size(), 256) : 0; }
 
 	uint32 flags;
 	/* @} */
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp
index 77b887778b..5604166794 100644
--- a/engines/sci/gfx/operations.cpp
+++ b/engines/sci/gfx/operations.cpp
@@ -1715,9 +1715,10 @@ static int _gfxop_set_pic(GfxState *state) {
 	// FIXME: The _gfxop_install_pixmap call below updates the OSystem palette.
 	// This is too soon, since it causes brief palette corruption until the
 	// screen is updated too. (Possibly related: EngineState::pic_not_valid .)
-	if (state->driver->getMode()->palette)
+	if (state->pic->visual_map->palette && state->driver->getMode()->palette) {
 		state->pic->visual_map->palette->forceInto(state->driver->getMode()->palette);
-	_gfxop_install_pixmap(state->driver, state->pic->visual_map);
+		_gfxop_install_pixmap(state->driver, state->pic->visual_map);
+	}
 
 #ifdef CUSTOM_GRAPHICS_OPTIONS
 	if (state->options->pic0_unscaled)
diff --git a/engines/sci/gfx/res_pal.cpp b/engines/sci/gfx/res_pal.cpp
index 97e7297d43..d686220453 100644
--- a/engines/sci/gfx/res_pal.cpp
+++ b/engines/sci/gfx/res_pal.cpp
@@ -44,6 +44,11 @@ Palette *gfxr_read_pal11(int id, byte *resource, int size) {
 	int entry_size = (format == SCI_PAL_FORMAT_VARIABLE_FLAGS) ? 4 : 3;
 	byte *pal_data = resource + 37;
 	int _colors_nr = READ_LE_UINT16(resource + 29);
+
+	// Happens at the beginning of Pepper
+	if (_colors_nr > 256)
+		return NULL;
+
 	Palette *retval = new Palette(_colors_nr + start_color);
 	int i;