[Scummvm-cvs-logs] scummvm master -> 52a4f94ed21117443b003be251c92fcbb0a3cdf1

[whoozle]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d413494f5b DREAMWEB: Added assert on memcpy overlap
52a4f94ed2 DREAMWEB: Added italian floppy release


Commit: d413494f5b0485008bbc6074fca07bb00f448c40
    https://github.com/scummvm/scummvm/commit/d413494f5b0485008bbc6074fca07bb00f448c40
Author: Vladimir Menshakov (whoozle at yandex.ru)
Date: 2011-06-25T15:35:44-07:00

Commit Message:
DREAMWEB: Added assert on memcpy overlap

Changed paths:
    engines/dreamweb/runtime.h



diff --git a/engines/dreamweb/runtime.h b/engines/dreamweb/runtime.h
index 724d5e4..2951ad8 100644
--- a/engines/dreamweb/runtime.h
+++ b/engines/dreamweb/runtime.h
@@ -466,6 +466,7 @@ public:
 		assert(size != 0xffff);
 		uint8 *dst = es.ptr(di, size);
 		uint8 *src = ds.ptr(si, size);
+		assert(src < dst || src >= dst + size);
 		memcpy(dst, src, size);
 		di += size;
 		si += size;


Commit: 52a4f94ed21117443b003be251c92fcbb0a3cdf1
    https://github.com/scummvm/scummvm/commit/52a4f94ed21117443b003be251c92fcbb0a3cdf1
Author: Vladimir Menshakov (whoozle at yandex.ru)
Date: 2011-06-25T15:39:47-07:00

Commit Message:
DREAMWEB: Added italian floppy release

Changed paths:
    engines/dreamweb/detection_tables.h



diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h
index 0208b7e..0449361 100644
--- a/engines/dreamweb/detection_tables.h
+++ b/engines/dreamweb/detection_tables.h
@@ -132,6 +132,23 @@ static const DreamWebGameDescription gameDescriptions[] = {
 		},
 	},
 
+	// Italian floppy release
+	{
+		{
+			"dreamweb",
+			"",
+			{
+				{"dreamweb.r00", 0, "66dcab08354232f423c590156335f819", 155448},
+				{"dreamweb.r02", 0, "87a026e9f80ed4f94169381f871ee305", 199676},
+				AD_LISTEND
+			},
+			Common::IT_ITA,
+			Common::kPlatformPC,
+			ADGF_UNSTABLE,
+			GUIO_NONE
+		},
+	},
+
 	{ AD_TABLE_END_MARKER }
 };