From 9916b263831f20e5841275051a8ed014de1f24eb Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Wed, 29 Nov 2017 00:06:12 -0600
Subject: SCUMM: Replace UB-triggering serialization code with
 Common::Serializer

Fixes Trac#10342.
---
 engines/scumm/actor.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'engines/scumm/actor.h')

diff --git a/engines/scumm/actor.h b/engines/scumm/actor.h
index 62ba161f4e..c059d08397 100644
--- a/engines/scumm/actor.h
+++ b/engines/scumm/actor.h
@@ -25,6 +25,7 @@
 #define SCUMM_ACTOR_H
 
 #include "common/scummsys.h"
+#include "common/serializer.h"
 #include "scumm/saveload.h"
 #include "scumm/scumm.h"
 
@@ -82,7 +83,7 @@ enum {
 	kNewInavlidBox = 0
 };
 
-class Actor : public Serializable {
+class Actor : public Common::Serializable {
 public:
 	static byte kInvalidBox;
 
@@ -300,8 +301,7 @@ public:
 
 	void classChanged(int cls, bool value);
 
-	// Used by the save/load system:
-	virtual void saveLoadWithSerializer(Serializer *ser);
+	virtual void saveLoadWithSerializer(Common::Serializer &ser);
 
 protected:
 	bool isInClass(int cls);
@@ -421,8 +421,7 @@ public:
 	void setTmpFromActor();
 	void setActorFromTmp();
 
-	// Used by the save/load system:
-	virtual void saveLoadWithSerializer(Serializer *ser);
+	virtual void saveLoadWithSerializer(Common::Serializer &ser);
 };
 
 
-- 
cgit v1.2.3