mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r14204) -Fix (r7475): when determining length of a string with limited size, first check if we are not out of bounds already

This commit is contained in:
smatz 2008-08-31 17:34:03 +00:00
parent 7bc5b136b1
commit f2dbe6685d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/string_func.h
View File

@ -48,7 +48,7 @@ static inline bool StrEmpty(const char *s) { return s == NULL || s[0] == '\0'; }
static inline size_t ttd_strnlen(const char *str, size_t maxlen)
{
const char *t;
for (t = str; *t != '\0' && (size_t)(t - str) < maxlen; t++) {}
for (t = str; (size_t)(t - str) < maxlen && *t != '\0'; t++) {}
return t - str;
}