Properly initializing data in ModelInfo/LandTableInfo.

X-Hax · Apr 10, 2015 · 9458e3b · 9458e3b
1 parent bc5af3b
commit 9458e3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/libmodutils/LandTableInfo.cpp b/src/libmodutils/LandTableInfo.cpp
@@ -130,7 +130,10 @@ void LandTableInfo::fixmodelpointers(NJS_MODEL_SADX *model, intptr_t base)
 			NJS_MESHSET_SADX *tmp = new NJS_MESHSET_SADX[model->nbMeshset];
 			reallocateddata[model->meshsets] = tmp;
 			for (int i = 0; i < model->nbMeshset; i++)
+			{
 				memcpy(&tmp[i], &((NJS_MESHSET *)model->meshsets)[i], sizeof(NJS_MESHSET));
+				tmp[i].null = 0;
+			}
 			model->meshsets = tmp;
 			allocatedmem.push_back(shared_ptr<NJS_MESHSET_SADX>(model->meshsets, default_delete<NJS_MESHSET_SADX[]>()));
 			for (int i = 0; i < model->nbMeshset; i++)
@@ -158,6 +161,7 @@ void LandTableInfo::fixobjectpointers(NJS_OBJECT *object, intptr_t base)
 			NJS_MODEL_SADX *tmp = new NJS_MODEL_SADX;
 			reallocateddata[object->model] = tmp;
 			memcpy(tmp, object->model, sizeof(NJS_MODEL));
+			tmp->null = 0;
 			object->basicdxmodel = tmp;
 			allocatedmem.push_back(shared_ptr<NJS_MODEL_SADX>(object->basicdxmodel, default_delete<NJS_MODEL_SADX>()));
 			fixmodelpointers(object->basicdxmodel, base);

diff --git a/src/libmodutils/ModelInfo.cpp b/src/libmodutils/ModelInfo.cpp
@@ -133,7 +133,10 @@ void ModelInfo::fixbasicmodelpointers(NJS_MODEL_SADX *model, intptr_t base)
 			NJS_MESHSET_SADX *tmp = new NJS_MESHSET_SADX[model->nbMeshset];
 			reallocateddata[model->meshsets] = tmp;
 			for (int i = 0; i < model->nbMeshset; i++)
+			{
 				memcpy(&tmp[i], &((NJS_MESHSET *)model->meshsets)[i], sizeof(NJS_MESHSET));
+				tmp[i].null = 0;
+			}
 			model->meshsets = tmp;
 			allocatedmem.push_back(shared_ptr<NJS_MESHSET_SADX>(model->meshsets, default_delete<NJS_MESHSET_SADX[]>()));
 			for (int i = 0; i < model->nbMeshset; i++)
@@ -169,6 +172,7 @@ void ModelInfo::fixobjectpointers(NJS_OBJECT *object, intptr_t base)
 				NJS_MODEL_SADX *tmp = new NJS_MODEL_SADX;
 				reallocateddata[object->model] = tmp;
 				memcpy(tmp, object->model, sizeof(NJS_MODEL));
+				tmp->null = 0;
 				object->basicdxmodel = tmp;
 				allocatedmem.push_back(shared_ptr<NJS_MODEL_SADX>(object->basicdxmodel, default_delete<NJS_MODEL_SADX>()));
 				fixbasicmodelpointers(object->basicdxmodel, base);