From 71450881fc9343430a1558193b4f4c9eb888a73d Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Wed, 6 Jun 2018 08:22:58 +0100 Subject: [PATCH 1/3] Codechange: Avoid call to memcpy using null pointer in TooltipsWindow constructor Strictly speaking, calling memcpy with src as a nullptr is undefined behaviour and the optimiser is entitled to delete any null ptr checks which occur afterwards. This removes the warning emitted by UndefinedBehaviorSantizer. --- src/misc_gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 5252832b55..dd75410628 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -656,7 +656,7 @@ struct TooltipsWindow : public Window this->string_id = str; assert_compile(sizeof(this->params[0]) == sizeof(params[0])); assert(paramcount <= lengthof(this->params)); - memcpy(this->params, params, sizeof(this->params[0]) * paramcount); + if (paramcount > 0) memcpy(this->params, params, sizeof(this->params[0]) * paramcount); this->paramcount = paramcount; this->close_cond = close_tooltip; From 20b0f0f90bf937ebea1c38e9e5b503ea9ad32235 Mon Sep 17 00:00:00 2001 From: translators Date: Thu, 7 Jun 2018 19:45:38 +0200 Subject: [PATCH 2/3] Update: Translations from eints italian: 3 changes by lorenzodv --- src/lang/italian.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lang/italian.txt b/src/lang/italian.txt index 6d27d725fe..460fff8919 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -4264,6 +4264,7 @@ STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD :{WHITE}... ques STR_ERROR_DRIVE_THROUGH_DIRECTION :{WHITE}... strada rivolta nella direzione sbagliata STR_ERROR_DRIVE_THROUGH_CORNER :{WHITE}... le fermate passanti non possono trovarsi in curva STR_ERROR_DRIVE_THROUGH_JUNCTION :{WHITE}... le fermate passanti non possono avere raccordi +STR_ERROR_DRIVE_THROUGH_ON_ONEWAY_ROAD :{WHITE}... la strada รจ bloccata o a senso unico # Station destruction related errors STR_ERROR_CAN_T_REMOVE_PART_OF_STATION :{WHITE}Impossibile rimuovere parte della stazione... @@ -4515,6 +4516,8 @@ STR_BASESOUNDS_DOS_DESCRIPTION :Suoni originali STR_BASESOUNDS_WIN_DESCRIPTION :Suoni originali di Transport Tycoon Deluxe, edizione Windows. STR_BASESOUNDS_NONE_DESCRIPTION :Un pacchetto sonoro non contenente alcun suono. STR_BASEMUSIC_WIN_DESCRIPTION :Musica originale di Transport Tycoon Deluxe, edizione Windows. +STR_BASEMUSIC_DOS_DESCRIPTION :Musica originale di Transport Tycoon Deluxe, edizione DOS. +STR_BASEMUSIC_TTO_DESCRIPTION :Musica originale di Transport Tycoon (edizione Original/World). STR_BASEMUSIC_NONE_DESCRIPTION :Un pacchetto musicale non contenente alcuna musica. ##id 0x2000 From 11d1690acb73e77995558dad8fbdde1034e969ed Mon Sep 17 00:00:00 2001 From: Andy Date: Thu, 7 Jun 2018 21:00:01 +0100 Subject: [PATCH 3/3] Doc: note in README licensing section that CONTRIBUTING.md is adapted from Bootstrap (#6818) --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 2ed6d79887..62007b7072 100644 --- a/README.md +++ b/README.md @@ -701,6 +701,10 @@ licensing terms can be found in os/dos/cwsdpmi/cwsdpmi.txt. The sources for these files can be downloaded at its author site, at: [http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi5s.zip](http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi5s.zip) +CONTRIBUTING.md is adapted from [Bootstrap](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) +under the [Creative Commons Attribution 3.0 Unported License](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE) +terms for Bootstrap documentation. + ## X.X) Credits ### The OpenTTD team (in alphabetical order):