diff options
| author | Einar Johan Trøan Sømåen | 2012-08-11 02:30:07 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-11 02:30:07 +0200 |
| commit | c422ae9d8a90aeb63da3e3fdf521323fe6769828 (patch) | |
| tree | 9ef6303f4d84bb32f4fb9b2dfea37dc9b5f5ce45 /engines/wintermute/base/base_parser.cpp | |
| parent | d95a2ddef84bb786979affddd95074da79032560 (diff) | |
| download | scummvm-rg350-c422ae9d8a90aeb63da3e3fdf521323fe6769828.tar.gz scummvm-rg350-c422ae9d8a90aeb63da3e3fdf521323fe6769828.tar.bz2 scummvm-rg350-c422ae9d8a90aeb63da3e3fdf521323fe6769828.zip | |
WINTERMUTE: Get rid of strncpy+manual termination.
Diffstat (limited to 'engines/wintermute/base/base_parser.cpp')
| -rw-r--r-- | engines/wintermute/base/base_parser.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp index 1b39b55768..75268f6483 100644 --- a/engines/wintermute/base/base_parser.cpp +++ b/engines/wintermute/base/base_parser.cpp @@ -386,8 +386,7 @@ int BaseParser::scanStr(const char *in, const char *format, ...) { in++;
const char *in2 = strchr(in, '\'');
if (in2) {
- strncpy(a, in, (int)(in2 - in));
- a[(int)(in2 - in)] = 0;
+ Common::strlcpy(a, in, (int)(in2 - in) + 1);
in = in2 + 1;
} else {
strcpy(a, in);
@@ -395,8 +394,7 @@ int BaseParser::scanStr(const char *in, const char *format, ...) { }
} else {
const char *in2 = in + strspn(in, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789.");
- strncpy(a, in, (int)(in2 - in));
- a[(int)(in2 - in)] = 0;
+ Common::strlcpy(a, in, (int)(in2 - in) + 1);
in = in2;
}
in += strspn(in, " \t\n\f");
|