mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17078) [0.7] -Fix [FS#3082]: crash when renaming some towns (already fixed in trunk by rewrite of the function)

release/0.7
rubidium 2009-08-05 23:32:18 +00:00
parent 19cad228e8
commit 645664eced
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/strings.cpp
View File

@ -189,7 +189,7 @@ static char *FormatCommaNumber(char *buff, int64 number, const char *last)
uint64 tot; uint64 tot;
uint64 num; uint64 num;
if (number < 0) { if (number < 0 && buff < last) {
*buff++ = '-'; *buff++ = '-';
number = -number; number = -number;
} }
@ -197,7 +197,7 @@ static char *FormatCommaNumber(char *buff, int64 number, const char *last)
num = number; num = number;
tot = 0; tot = 0;
for (i = 0; i < 20; i++) { for (i = 0; i < 20 && buff < last; i++) {
quot = 0; quot = 0;
if (num >= divisor) { if (num >= divisor) {
quot = num / divisor; quot = num / divisor;
@ -205,7 +205,7 @@ static char *FormatCommaNumber(char *buff, int64 number, const char *last)
} }
if (tot |= quot || i == 19) { if (tot |= quot || i == 19) {
*buff++ = '0' + quot; *buff++ = '0' + quot;
if ((i % 3) == 1 && i != 19) *buff++ = ','; if ((i % 3) == 1 && i != 19 && buff < last) *buff++ = ',';
} }
divisor /= 10; divisor /= 10;
@ -233,7 +233,7 @@ static char *FormatNoCommaNumber(char *buff, int64 number, const char *last)
num = number; num = number;
tot = 0; tot = 0;
for (i = 0; i < 20; i++) { for (i = 0; i < 20 && buff < last; i++) {
quot = 0; quot = 0;
if (num >= divisor) { if (num >= divisor) {
quot = num / divisor; quot = num / divisor;