LIV2/WinUAE
1
0
Fork 0
mirror of https://github.com/LIV2/WinUAE.git synced 2025-12-06 00:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix double free and memory leaks

Browse Source
This commit is contained in:
Toni Wilen 2024-01-13 12:31:10 +02:00
parent c2b2108fda
commit bb04434495
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calc.cpp
View File

@ -282,6 +282,7 @@ static TCHAR *stacktostring(struct calcstack *st)
if (_tcslen(st->s) == 1 && st->s[0] >= 'a' && st->s[0] <= 'z') { if (_tcslen(st->s) == 1 && st->s[0] >= 'a' && st->s[0] <= 'z') {
TCHAR *s = parsedvaluess[st->s[0] - 'a']; TCHAR *s = parsedvaluess[st->s[0] - 'a'];
if (s) { if (s) {
xfree(st->vals);
st->vals = my_strdup(s); st->vals = my_strdup(s);
xfree(st->s); xfree(st->s);
st->s = NULL; st->s = NULL;
@ -290,6 +291,7 @@ static TCHAR *stacktostring(struct calcstack *st)
double v = parsedvaluesd[st->s[0] - 'a']; double v = parsedvaluesd[st->s[0] - 'a'];
TCHAR tmp[256]; TCHAR tmp[256];
_stprintf(tmp, _T("%d"), (int)v); _stprintf(tmp, _T("%d"), (int)v);
xfree(st->vals);
st->vals = my_strdup(tmp); st->vals = my_strdup(tmp);
xfree(st->s); xfree(st->s);
st->s = NULL; st->s = NULL;
@ -476,7 +478,7 @@ static TCHAR *chartostack(TCHAR c)
return s; return s;
} }
static struct calcstack stack[STACK_SIZE] = { 0 }; static struct calcstack stack[STACK_SIZE];
static bool execution_order(const TCHAR *input, double *outval, TCHAR *outstring, int maxlen) static bool execution_order(const TCHAR *input, double *outval, TCHAR *outstring, int maxlen)
{ {
@ -558,7 +560,6 @@ static bool execution_order(const TCHAR *input, double *outval, TCHAR *outstring
if (isstackstring(sc2)) { if (isstackstring(sc2)) {
TCHAR *c = stacktostring(sc2); TCHAR *c = stacktostring(sc2);
_tcscpy(vals, c); _tcscpy(vals, c);
xfree(c);
} }
val = stacktoval(sc2); val = stacktoval(sc2);
} }
@ -759,7 +760,11 @@ int calc(const TCHAR *input, double *outval, TCHAR *outstring, int maxlen)
if (outstring) { if (outstring) {
outstring[0] = 0; outstring[0] = 0;
} }
if (parse_values(input, output2)) { for (int i = 0; i < STACK_SIZE; i++) {
struct calcstack *s = &stack[i];
memset(s, 0, sizeof(struct calcstack));
}
if (parse_values(input, output2)) {
if(shunting_yard(output2, output)) { if(shunting_yard(output2, output)) {
calc_log ((_T("RPN OUT: %s\n"), output)); calc_log ((_T("RPN OUT: %s\n"), output));
if(!execution_order(output, outval, outstring, maxlen)) { if(!execution_order(output, outval, outstring, maxlen)) {