UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed various memory relocation corruption bugs in the translator

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401139
This commit is contained in:
David Anderson 2007-07-19 02:08:42 +00:00
parent 3fdc205544
commit c4a913231a
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/Translator.cpp
View File

@ -181,7 +181,6 @@ SMCParseResult CPhraseFile::ReadSMC_NewSection(const char *name, bool opt_quotes
pPhrase->fmt_list = -1; pPhrase->fmt_list = -1;
int trans_tbl = m_pMemory->CreateMem(sizeof(trans_t) * m_LangCount, (void **)&pTrans); int trans_tbl = m_pMemory->CreateMem(sizeof(trans_t) * m_LangCount, (void **)&pTrans);
/* Update the pointer! */
pPhrase = (phrase_t *)m_pMemory->GetAddress(m_CurPhrase); pPhrase = (phrase_t *)m_pMemory->GetAddress(m_CurPhrase);
pPhrase->trans_tbl = trans_tbl; pPhrase->trans_tbl = trans_tbl;
@ -303,7 +302,11 @@ SMCParseResult CPhraseFile::ReadSMC_KeyValue(const char *key, const char *value,
/* Allocate the format table */ /* Allocate the format table */
char fmt_buf[16]; char fmt_buf[16];
int *fmt_list; int *fmt_list;
pPhrase->fmt_list = m_pMemory->CreateMem(sizeof(int) * pPhrase->fmt_count, (void **)&fmt_list); int tmp = m_pMemory->CreateMem(sizeof(int) * pPhrase->fmt_count, (void **)&fmt_list);
/* Update the phrase pointer in case it changed */
pPhrase = (phrase_t *)m_pMemory->GetAddress(m_CurPhrase);
pPhrase->fmt_list = tmp;
/* Initialize */ /* Initialize */
for (size_t i=0; i<pPhrase->fmt_count; i++) for (size_t i=0; i<pPhrase->fmt_count; i++)
@ -366,6 +369,8 @@ SMCParseResult CPhraseFile::ReadSMC_KeyValue(const char *key, const char *value,
state = Parse_None; state = Parse_None;
/* Now, add this to our table */ /* Now, add this to our table */
fmt_list[cur_idx - 1] = m_pStringTab->AddString(fmt_buf); fmt_list[cur_idx - 1] = m_pStringTab->AddString(fmt_buf);
pPhrase = (phrase_t *)m_pMemory->GetAddress(m_CurPhrase);
fmt_list = (int *)m_pMemory->GetAddress(pPhrase->fmt_list);
pPhrase->fmt_bytes += strlen(fmt_buf); pPhrase->fmt_bytes += strlen(fmt_buf);
} else { } else {
if (!out_ptr) if (!out_ptr)
@ -427,6 +432,9 @@ SMCParseResult CPhraseFile::ReadSMC_KeyValue(const char *key, const char *value,
out_idx = m_pMemory->CreateMem(len, (void **)&out_buf); out_idx = m_pMemory->CreateMem(len, (void **)&out_buf);
/* Update pointer */
pPhrase = (phrase_t *)m_pMemory->GetAddress(m_CurPhrase);
int *fmt_order; int *fmt_order;
int *fmt_list = (int *)m_pMemory->GetAddress(pPhrase->fmt_list); int *fmt_list = (int *)m_pMemory->GetAddress(pPhrase->fmt_list);
trans_t *pTrans = (trans_t *)m_pMemory->GetAddress(pPhrase->trans_tbl); trans_t *pTrans = (trans_t *)m_pMemory->GetAddress(pPhrase->trans_tbl);
@ -439,7 +447,16 @@ SMCParseResult CPhraseFile::ReadSMC_KeyValue(const char *key, const char *value,
/* Build the format order list, if necessary */ /* Build the format order list, if necessary */
if (fmt_list) if (fmt_list)
{ {
pTrans->fmt_order = m_pMemory->CreateMem(pPhrase->fmt_count * sizeof(int), (void **)&fmt_order); int tmp = m_pMemory->CreateMem(pPhrase->fmt_count * sizeof(int), (void **)&fmt_order);
/* Update pointers */
pPhrase = (phrase_t *)m_pMemory->GetAddress(m_CurPhrase);
pTrans = (trans_t *)m_pMemory->GetAddress(pPhrase->trans_tbl);
fmt_list = (int *)m_pMemory->GetAddress(pPhrase->fmt_list);
pTrans = &pTrans[lang];
/* Now it's safe to save the index */
pTrans->fmt_order = tmp;
for (unsigned int i=0; i<pPhrase->fmt_count; i++) for (unsigned int i=0; i<pPhrase->fmt_count; i++)
{ {