From a76a36915c7d348582f905629fa0840a88b02edb Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 27 Nov 2016 15:36:30 +0000
Subject: Ensure the memory for the mem-handler interrupt is allocated

---
 frontends/amiga/memory.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'frontends/amiga/memory.c')

diff --git a/frontends/amiga/memory.c b/frontends/amiga/memory.c
index abf849db6..880131a7d 100755
--- a/frontends/amiga/memory.c
+++ b/frontends/amiga/memory.c
@@ -74,6 +74,7 @@ static ASM ULONG ami_memory_handler(REG(a0, struct MemHandlerData *mhd), REG(a1,
 struct Interrupt *ami_memory_init(void)
 {
 	struct Interrupt *memhandler = malloc(sizeof(struct Interrupt));
+	if(memhandler == NULL) return NULL; // we're screwed
 
 	memhandler->is_Node.ln_Pri = 1;
 	memhandler->is_Node.ln_Name = "NetSurf slab memory handler";
@@ -86,8 +87,10 @@ struct Interrupt *ami_memory_init(void)
 
 void ami_memory_fini(struct Interrupt *memhandler)
 {
-	RemMemHandler(memhandler);
-	free(memhandler);
+	if(memhandler != NULL) {
+		RemMemHandler(memhandler);
+		free(memhandler);
+	}
 }
 
 #endif
-- 
cgit v1.2.3