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

(svn r4897) - NewGRF: don't allow addition of empty strings in action 4

release/0.5
peter1138 2006-05-17 13:05:44 +00:00
parent 5a65e3301e
commit d40bc5a264
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
newgrf.c
View File

@ -1793,7 +1793,7 @@ static void VehicleNewName(byte *buf, int len)
for (; id < endid && len > 0; id++) { for (; id < endid && len > 0; id++) {
size_t ofs = strlen(name) + 1; size_t ofs = strlen(name) + 1;
if (ofs < 128) { if (ofs > 1 && ofs < 128) {
DEBUG(grf, 8) ("VehicleNewName: %d <- %s", id, name); DEBUG(grf, 8) ("VehicleNewName: %d <- %s", id, name);
switch (feature) { switch (feature) {
@ -1857,7 +1857,13 @@ static void VehicleNewName(byte *buf, int len)
#endif #endif
} }
} else { } else {
DEBUG(grf, 7) ("VehicleNewName: Too long a name (%d)", ofs); /* ofs is the string length + 1, so if the string is empty, ofs
* is 1 */
if (ofs == 1) {
DEBUG(grf, 7) ("VehicleNewName: Can't add empty name");
} else {
DEBUG(grf, 7) ("VehicleNewName: Too long a name (%d)", ofs);
}
} }
name += ofs; name += ofs;
len -= ofs; len -= ofs;