From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 16 Oct 2003 11:41:18 +0000 (+0000)
Subject: handle one error condition I forgot to code in PF_setattachment (modelindex was check... 
X-Git-Tag: xonotic-v0.1.0preview~6308
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c07e1f2b31de62fd14ffd9d4bd93714797503c87;p=xonotic%2Fdarkplaces.git

handle one error condition I forgot to code in PF_setattachment (modelindex was checked, but did not check for it resolving to a NULL model, as is the case whem modelindex is 0)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3586 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/pr_cmds.c b/pr_cmds.c
index a7468f0a..5f033db0 100644
--- a/pr_cmds.c
+++ b/pr_cmds.c
@@ -2968,9 +2968,8 @@ void PF_setattachment (void)
 	if (tagentity != NULL && tagentity != sv.edicts && tagname && tagname[0])
 	{
 		modelindex = (int)tagentity->v->modelindex;
-		if (modelindex >= 0 && modelindex < MAX_MODELS)
+		if (modelindex >= 0 && modelindex < MAX_MODELS && (model = sv.models[modelindex]))
 		{
-			model = sv.models[modelindex];
 			if (model->data_overridetagnamesforskin && (unsigned int)tagentity->v->skin < (unsigned int)model->numskins && model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames)
 				for (i = 0;i < model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].num_overridetagnames;i++)
 					if (!strcmp(tagname, model->data_overridetagnamesforskin[(unsigned int)tagentity->v->skin].data_overridetagnames[i].name))