mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-17 11:39:11 +00:00
Code Issues Activity

(svn r6884) -Codechange: Add strict bounds checking in string formatting system.

Browse Source 
The last parameter should point to the end of the buffer (eg lastof(buf))
 Courtesy of Tron.
This commit is contained in:
Darkvater
2006-10-21 23:31:34 +00:00
parent 7f36a980c7
commit ee27bb497c
33 changed files with 240 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
string.c
View File

@@ -1,6 +1,8 @@
/* $Id$ */
#include "stdafx.h"
#include "openttd.h"
#include "functions.h"
#include "string.h"
#include <stdarg.h>
@@ -26,7 +28,7 @@ void ttd_strlcpy(char *dst, const char *src, size_t size)
char* strecat(char* dst, const char* src, const char* last)
{
assert(last == NULL || dst <= last);
assert(dst <= last);
for (; *dst != '\0'; ++dst)
if (dst == last) return dst;
for (; *src != '\0' && dst != last; ++dst, ++src) *dst = *src;
@@ -37,9 +39,14 @@ char* strecat(char* dst, const char* src, const char* last)
char* strecpy(char* dst, const char* src, const char* last)
{
assert(last == NULL || dst <= last);
assert(dst <= last);
for (; *src != '\0' && dst != last; ++dst, ++src) *dst = *src;
*dst = '\0';
#if 0
if (dst == last && *src != '\0') {
error("String too long for destination buffer");
}
#endif
return dst;
}