From 1f7ccd02938a1e418bf83ed44014631187df7fcb Mon Sep 17 00:00:00 2001
From: James Brown
Date: Thu, 11 Nov 2004 13:37:35 +0000
Subject: Bring kyra up-to-date with patch 1051358

svn-id: r15786
---
 kyra/codecs.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'kyra/codecs.cpp')

diff --git a/kyra/codecs.cpp b/kyra/codecs.cpp
index 1205442ec1..e90ebdcd68 100644
--- a/kyra/codecs.cpp
+++ b/kyra/codecs.cpp
@@ -84,9 +84,13 @@ int Compression::decode80(const uint8* image_in, uint8* image_out) {
 					copyp = (const uint8*)&image_out[READ_LE_UINT16(readp)];
 					readp += 2;
 
-					memcpy(writep, copyp, count);
-					writep += count;
-					copyp += count;
+					// FIXME: Using memmove sometimes segfaults 
+					// (reproducably for Ender), which suggests something Bad here
+					//memmove(writep, copyp, count);
+					//writep += count;
+					//copyp += count;
+					while (count--)
+						*writep++ = *copyp++;
 				} else if (count == 0x3e) {
 					//command 3 (11111110 c c v): fill
 
-- 
cgit v1.2.3