Merge branch 'master' of github.com:scummvm/scummvm

8 files changed, 25 insertions, 13 deletions

diff --git a/AUTHORS b/AUTHORS
index 0b9d41559b..ca6342d836 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -421,7 +421,7 @@ Other contributions
      David Jensen          - SVG logo conversion
      Jean Marc Gimenez     - ScummVM logo
      Raina                 - ScummVM forum buttons
-     William Claydon       - Skins for doxygen and wiki
+     William Claydon       - Skins for doxygen, buildbot and wiki
 
   Code contributions
   ------------------
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index d6e79248f9..2c0c45907f 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -378,7 +378,11 @@ void OSystem_SDL::setupIcon() {
 	unsigned int rgba[256];
 	unsigned int *icon;
 
-	sscanf(scummvm_icon[0], "%d %d %d %d", &w, &h, &ncols, &nbytes);
+	if (sscanf(scummvm_icon[0], "%d %d %d %d", &w, &h, &ncols, &nbytes) != 4) {
+		warning("Wrong format of scummvm_icon[0] (%s)", scummvm_icon[0]);
+		
+		return;
+	}
 	if ((w > 512) || (h > 512) || (ncols > 255) || (nbytes > 1)) {
 		warning("Could not load the built-in icon (%d %d %d %d)", w, h, ncols, nbytes);
 		return;
@@ -393,13 +397,17 @@ void OSystem_SDL::setupIcon() {
 		unsigned char code;
 		char color[32];
 		unsigned int col;
-		sscanf(scummvm_icon[1 + i], "%c c %s", &code, color);
+		if (sscanf(scummvm_icon[1 + i], "%c c %s", &code, color) != 2) {
+			warning("Wrong format of scummvm_icon[%d] (%s)", 1 + i, scummvm_icon[1 + i]);
+		}
 		if (!strcmp(color, "None"))
 			col = 0x00000000;
 		else if (!strcmp(color, "black"))
 			col = 0xFF000000;
 		else if (color[0] == '#') {
-			sscanf(color + 1, "%06x", &col);
+			if (sscanf(color + 1, "%06x", &col) != 1) {
+				warning("Wrong format of color (%s)", color + 1);
+			}
 			col |= 0xFF000000;
 		} else {
 			warning("Could not load the built-in icon (%d %s - %s) ", code, color, scummvm_icon[1 + i]);
diff --git a/common/macresman.cpp b/common/macresman.cpp
index e7d4a30789..b06d986ca2 100644
--- a/common/macresman.cpp
+++ b/common/macresman.cpp
@@ -623,6 +623,11 @@ void MacResManager::convertCrsrCursor(SeekableReadStream *data, byte **cursor, i
 	// Pixel data for cursor
 	int iconDataSize =  iconRowBytes * (iconBounds[3] - iconBounds[1]);
 	byte *iconData = new byte[iconDataSize];
+
+	if (!iconData) {
+		error("Cannot allocate iconData in macresman.cpp");
+	}
+
 	data->read(iconData, iconDataSize);
 
 	// Color table
diff --git a/configure b/configure
index a70b89e975..d673f2d612 100755
--- a/configure
+++ b/configure
@@ -88,7 +88,7 @@ add_engine drascula "Drascula: The Vampire Strikes Back" yes
 add_engine gob "Gobli*ns" yes
 add_engine groovie "Groovie" yes "groovie2"
 add_engine groovie2 "Groovie 2 games" no
-add_engine hugo "Hugo Trilogy" no
+add_engine hugo "Hugo Trilogy" yes
 add_engine kyra "Legend of Kyrandia" yes "lol"
 add_engine lol "Lands of Lore" no
 add_engine lastexpress "The Last Express" no
diff --git a/devtools/credits.pl b/devtools/credits.pl
index fc10f50bfb..94f72617af 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -977,7 +977,7 @@ begin_credits("Credits");
 		  add_person("David Jensen", "Tyst", "SVG logo conversion");
 		  add_person("Jean Marc Gimenez", "", "ScummVM logo");
 		  add_person("", "Raina", "ScummVM forum buttons");
-		  add_person("William Claydon", "billwashere", "Skins for doxygen and wiki");
+		  add_person("William Claydon", "billwashere", "Skins for doxygen, buildbot and wiki");
 	  end_persons();
 	end_section();
 
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 9e3b3fcc0e..e9f0079236 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -2243,7 +2243,6 @@ void SceneObject::removeObject() {
 	_globals->_sceneObjects->remove(this);
 
 	if (_visage) {
-		_vm->_memoryManager.deallocate(_visage);
 		_visage = 0;
 	}
 
diff --git a/engines/tsage/ringworld_scenes3.cpp b/engines/tsage/ringworld_scenes3.cpp
index b4a456e748..c0afe48708 100644
--- a/engines/tsage/ringworld_scenes3.cpp
+++ b/engines/tsage/ringworld_scenes3.cpp
@@ -4864,7 +4864,10 @@ void Scene2310::postInit(SceneObjectList *OwnerList) {
 	_globals->_events.setCursor(CURSOR_WALK);
 
 	_wireIndex = 5;
-	_pageIndex = _globals->_randomSource.getRandomNumber(19) + 1;
+	if (_vm->getFeatures() & GF_CD)
+		_pageIndex = _globals->_randomSource.getRandomNumber(14) + 2;
+	else
+		_pageIndex = _globals->_randomSource.getRandomNumber(19) + 1;
 	signal();
 }
 
@@ -4966,10 +4969,7 @@ void Scene2310::process(Event &event) {
 }
 
 void Scene2310::dispatch() {
-	if ((_vm->getFeatures() & GF_CD) && !ConfMan.getBool("copy_protection")) {
-		// CD version of Ringworld has the copy protection disabled
-		signal();
-	} else if (_wireIndex != 5) {
+	if (_wireIndex != 5) {
 		for (int idx = 0; idx < 5; ++idx) {
 			if (_rectList[idx].contains(_globals->_events._mousePos)) {
 				_wireList[_wireIndex].setFrame(idx + 2);
diff --git a/gui/credits.h b/gui/credits.h
index c12d5a4394..7ad480032e 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -476,7 +476,7 @@ static const char *credits[] = {
 "C0""Raina",
 "C2""ScummVM forum buttons",
 "C0""William Claydon",
-"C2""Skins for doxygen and wiki",
+"C2""Skins for doxygen, buildbot and wiki",
 "",
 "C1""Code contributions",
 "C0""Ori Avtalion",