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

(svn r26504) -Fix (r26499): Obiwan and his gang.

release/1.5
frosch 2014-04-24 18:58:47 +00:00
parent 2e493fa806
commit d71cc434e4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/game_text.cpp
View File

@ -66,7 +66,7 @@ void NORETURN CDECL strgen_fatal(const char *s, ...)
*/ */
LanguageStrings::LanguageStrings(const char *language, const char *end) LanguageStrings::LanguageStrings(const char *language, const char *end)
{ {
this->language = stredup(language, end - 1); this->language = stredup(language, end != NULL ? end - 1 : NULL);
} }
/** Free everything. */ /** Free everything. */

12
src/ini_load.cpp
View File

@ -167,7 +167,7 @@ IniGroup *IniLoadFile::GetGroup(const char *name, size_t len, bool create_new)
if (!create_new) return NULL; if (!create_new) return NULL;
/* otherwise make a new one */ /* otherwise make a new one */
IniGroup *group = new IniGroup(this, name, name + len); IniGroup *group = new IniGroup(this, name, name + len - 1);
group->comment = strdup("\n"); group->comment = strdup("\n");
return group; return group;
} }
@ -264,7 +264,7 @@ void IniLoadFile::LoadFromDisk(const char *filename, Subdirectory subdir)
s++; // skip [ s++; // skip [
group = new IniGroup(this, s, e - 1); group = new IniGroup(this, s, e - 1);
if (comment_size != 0) { if (comment_size != 0) {
group->comment = stredup(comment, comment + comment_size); group->comment = stredup(comment, comment + comment_size - 1);
comment_size = 0; comment_size = 0;
} }
} else if (group != NULL) { } else if (group != NULL) {
@ -272,7 +272,7 @@ void IniLoadFile::LoadFromDisk(const char *filename, Subdirectory subdir)
/* A sequence group, use the line as item name without further interpretation. */ /* A sequence group, use the line as item name without further interpretation. */
IniItem *item = new IniItem(group, buffer, e - 1); IniItem *item = new IniItem(group, buffer, e - 1);
if (comment_size) { if (comment_size) {
item->comment = stredup(comment, comment + comment_size); item->comment = stredup(comment, comment + comment_size - 1);
comment_size = 0; comment_size = 0;
} }
continue; continue;
@ -290,7 +290,7 @@ void IniLoadFile::LoadFromDisk(const char *filename, Subdirectory subdir)
/* it's an item in an existing group */ /* it's an item in an existing group */
IniItem *item = new IniItem(group, s, t - 1); IniItem *item = new IniItem(group, s, t - 1);
if (comment_size != 0) { if (comment_size != 0) {
item->comment = stredup(comment, comment + comment_size); item->comment = stredup(comment, comment + comment_size - 1);
comment_size = 0; comment_size = 0;
} }
@ -306,7 +306,7 @@ void IniLoadFile::LoadFromDisk(const char *filename, Subdirectory subdir)
*e = '\0'; *e = '\0';
/* If the value was not quoted and empty, it must be NULL */ /* If the value was not quoted and empty, it must be NULL */
item->value = (!quoted && e == t) ? NULL : stredup(t, e); item->value = (!quoted && e == t) ? NULL : stredup(t);
if (item->value != NULL) str_validate(item->value, item->value + strlen(item->value)); if (item->value != NULL) str_validate(item->value, item->value + strlen(item->value));
} else { } else {
/* it's an orphan item */ /* it's an orphan item */
@ -315,7 +315,7 @@ void IniLoadFile::LoadFromDisk(const char *filename, Subdirectory subdir)
} }
if (comment_size > 0) { if (comment_size > 0) {
this->comment = stredup(comment, comment + comment_size); this->comment = stredup(comment, comment + comment_size - 1);
comment_size = 0; comment_size = 0;
} }