dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bug fixes by brainsucker

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3972 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-04-19 19:40:44 +00:00
parent 76d64a2992
commit 76391b7043
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Contrib/Math/Source/Math.c
View file

@ -761,7 +761,7 @@ void CopyArray(ExpressionItem *&item)
void ItemToType(ExpressionItem* &item, int type) void ItemToType(ExpressionItem* &item, int type)
{ {
char *buffer; char *buffer, *bp;
if (item == NULL) return; if (item == NULL) return;
int itemt = item->type & ITEMTYPE, oldtype = item->type & ITEMSUBTYPE; int itemt = item->type & ITEMTYPE, oldtype = item->type & ITEMSUBTYPE;
@ -781,9 +781,9 @@ void ItemToType(ExpressionItem* &item, int type)
*((double *)&(item->param1)) = (double) *((__int64 *)&(item->param1)); *((double *)&(item->param1)) = (double) *((__int64 *)&(item->param1));
else else
{ {
buffer = (char*) item->param1; bp = buffer = (char*) item->param1;
StringToItem(buffer, item, STI_FLOAT); StringToItem(buffer, item, STI_FLOAT);
dbgGlobalFree(buffer); dbgGlobalFree(bp);
} }
break; break;
case ITC_INT: case ITC_INT:
@ -791,9 +791,9 @@ void ItemToType(ExpressionItem* &item, int type)
*((__int64 *)&(item->param1)) = (__int64) *((double *)&(item->param1)); *((__int64 *)&(item->param1)) = (__int64) *((double *)&(item->param1));
else else
{ {
buffer = (char*) item->param1; bp = buffer = (char*) item->param1;
StringToItem(buffer, item, STI_INT); StringToItem(buffer, item, STI_INT);
dbgGlobalFree(buffer); dbgGlobalFree(bp);
} }
break; break;
case ITC_ARRAY: case ITC_ARRAY:
@ -1002,7 +1002,7 @@ void RunTree(ExpressionItem *from, ExpressionItem* &result, int options)
break; break;
} }
__int64 i1, i2, i3, i4; __int64 i1=0, i2=0, i3=0, i4=0;
if (((!item1)||((item1->type & ITEMTYPE)==IT_CONST)) && if (((!item1)||((item1->type & ITEMTYPE)==IT_CONST)) &&
((!item2)||((item2->type & ITEMTYPE)==IT_CONST))) ((!item2)||((item2->type & ITEMTYPE)==IT_CONST)))
{ {
@ -1098,7 +1098,7 @@ void RunTree(ExpressionItem *from, ExpressionItem* &result, int options)
int ir = -666; int ir = -666;
char *i1 = (item1)?((char*)item1->param1):(NULL); char *i1 = (item1)?((char*)item1->param1):(NULL);
char *i2 = (item2)?((char*)item2->param1):(NULL); char *i2 = (item2)?((char*)item2->param1):(NULL);
int sc = lstrcmp(i1, i2); int sc = (i1 && i2)?(lstrcmp(i1, i2)):((i1)?(1):((i2)?(-1):(0)));
switch (subtype) switch (subtype)
{ {