From b7aa5bb8fe869e6df2b2c8ad29ad26e12cc017ec Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 12 Oct 2018 14:33:26 +0900
Subject: [PATCH] Fix an oops messing up edict size.

---
 libs/gamecode/pr_load.c      |  2 +-
 tools/qfcc/source/obj_file.c | 28 ++++++++--------------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/libs/gamecode/pr_load.c b/libs/gamecode/pr_load.c
index b00efd12e..721b26bd7 100644
--- a/libs/gamecode/pr_load.c
+++ b/libs/gamecode/pr_load.c
@@ -180,7 +180,7 @@ PR_LoadProgsFile (progs_t *pr, QFile *file, int size)
 	pr->pr_edict_size = max (1, progs.entityfields) * 4;
 	// size of engine data
 	pr->pr_edict_size += sizeof (edict_t);
-	pr->pr_edict_size = align_size (pr->progs_size);
+	pr->pr_edict_size = align_size (pr->pr_edict_size);
 
 	pr->pr_edictareasize = pr->max_edicts * pr->pr_edict_size;
 
diff --git a/tools/qfcc/source/obj_file.c b/tools/qfcc/source/obj_file.c
index 1ebd97f4b..cdd18f991 100644
--- a/tools/qfcc/source/obj_file.c
+++ b/tools/qfcc/source/obj_file.c
@@ -193,11 +193,8 @@ qfo_init_string_space (qfo_t *qfo, qfo_mspace_t *space, strpool_t *strings)
 	space->type = qfos_string;
 	space->num_defs = 0;
 	space->defs = 0;
-	space->d.strings = 0;
-	if (strings->strings) {
-		space->d.strings = malloc (size);
-		memcpy (space->d.strings, strings->strings, size);
-	}
+	space->d.strings = malloc (size);
+	memcpy (space->d.strings, strings->strings, size);
 	space->data_size = strings->size;
 	space->id = qfo_strings_space;
 }
@@ -210,11 +207,8 @@ qfo_init_code_space (qfo_t *qfo, qfo_mspace_t *space, codespace_t *code)
 	space->type = qfos_code;
 	space->num_defs = 0;
 	space->defs = 0;
-	space->d.code = 0;
-	if (code->code) {
-		space->d.code = malloc (size);
-		memcpy (space->d.code, code->code, size);
-	}
+	space->d.code = malloc (size);
+	memcpy (space->d.code, code->code, size);
 	space->data_size = code->size;
 	space->id = qfo_code_space;
 }
@@ -228,11 +222,8 @@ qfo_init_data_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 	space->type = qfos_data;
 	space->defs = *defs;
 	space->num_defs = qfo_encode_defs (qfo, data->defs, defs, relocs);
-	space->d.data = 0;
-	if (data->data) {
-		space->d.data = malloc (size);
-		memcpy (space->d.data, data->data, size);
-	}
+	space->d.data = malloc (size);
+	memcpy (space->d.data, data->data, size);
 	space->data_size = data->size;
 }
 
@@ -258,11 +249,8 @@ qfo_init_type_space (qfo_t *qfo, qfo_def_t **defs, qfo_reloc_t **relocs,
 	space->type = qfos_type;
 	space->defs = *defs;
 	space->num_defs = qfo_encode_defs (qfo, data->defs, defs, relocs);
-	space->d.data = 0;
-	if (data->data) {
-		space->d.data = malloc (size);
-		memcpy (space->d.data, data->data, size);
-	}
+	space->d.data = malloc (size);
+	memcpy (space->d.data, data->data, size);
 	space->data_size = data->size;
 	space->id = qfo_type_space;
 }