summaryrefslogtreecommitdiff
path: root/common/minifig.cpp
diff options
context:
space:
mode:
authorleo2009-01-20 02:07:33 +0000
committerleo2009-01-20 02:07:33 +0000
commit39f41aa607a84a42c483a6356f06ff9d54c1450c (patch)
treea70bdcabc4f41023c4c0bb7da0589384b874b8aa /common/minifig.cpp
parent68581f47c7056ce27c20da2f5800f6b3ee77ac24 (diff)
Fixed HTML export crash, avoid more 0-size allocations.
git-svn-id: http://svn.leocad.org/tags/leocad-0.75@732 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'common/minifig.cpp')
-rw-r--r--common/minifig.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/minifig.cpp b/common/minifig.cpp
index 9098e49..805b066 100644
--- a/common/minifig.cpp
+++ b/common/minifig.cpp
@@ -458,8 +458,8 @@ MinifigWizard::MinifigWizard (GLWindow *share)
char *ptr, buf[32];
m_MinifigCount = Sys_ProfileLoadInt ("MinifigWizard", "Count", 0);
- m_MinifigNames = (char**)realloc (m_MinifigNames, sizeof (char**)*m_MinifigCount);
- m_MinifigTemplates = (char**)realloc (m_MinifigTemplates, sizeof (char**)*m_MinifigCount);
+ m_MinifigNames = (char**)realloc(m_MinifigNames, sizeof(char**) * (m_MinifigCount+1));
+ m_MinifigTemplates = (char**)realloc(m_MinifigTemplates, sizeof(char**) * (m_MinifigCount+1));
for (i = 0; i < m_MinifigCount; i++)
{
@@ -829,7 +829,7 @@ void MinifigWizard::Calculate ()
m3.Translate (pos[LC_MFW_LEFT_SHOE][0]-pos[LC_MFW_LEFT_LEG][0],
pos[LC_MFW_LEFT_SHOE][1]-pos[LC_MFW_LEFT_LEG][1],
pos[LC_MFW_LEFT_SHOE][2]-pos[LC_MFW_LEFT_LEG][2]);
- if (strcmp (m_Info[LC_MFW_LEFT_LEG]->m_strName, "773") == 0)
+ if (m_Info[LC_MFW_LEFT_LEG] && strcmp(m_Info[LC_MFW_LEFT_LEG]->m_strName, "773") == 0)
m3.Translate (-0.8f, 0, 0);
mat.CreateOld (0,0,0,rot[LC_MFW_LEFT_SHOE][0]-rot[LC_MFW_LEFT_LEG][0],
rot[LC_MFW_LEFT_SHOE][1]-rot[LC_MFW_LEFT_LEG][1],