diff --git a/bzflag-2.0.8_array-subscript2.patch b/bzflag-2.0.8_array-subscript2.patch new file mode 100644 index 0000000..1a2a089 --- /dev/null +++ b/bzflag-2.0.8_array-subscript2.patch @@ -0,0 +1,17 @@ +--- src/bzflag/ServerStartMenu.cxx ++++ src/bzflag/ServerStartMenu.cxx +@@ -319,14 +319,6 @@ + + void ServerStartMenu::setSettings(const char* _settings) + { +- // FIXME -- temporary to automatically upgrade old configurations +- if (strlen(_settings) == 14) { +- strcpy(settings, _settings); +- settings[12] = settings[13]; +- settings[13] = settings[14]; +- return; +- } +- + if (strlen(_settings) != strlen(settings)) return; + strcpy(settings, _settings); + } diff --git a/bzflag.changes b/bzflag.changes index 811540c..c35e2f5 100644 --- a/bzflag.changes +++ b/bzflag.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 16 14:30:35 CEST 2007 - pgajdos@suse.cz + +- fixed 'warning: array subscript is below array bounds' [#229908] +- array_subscript2.patch + ------------------------------------------------------------------- Tue Mar 13 11:55:18 CET 2007 - pgajdos@suse.cz diff --git a/bzflag.spec b/bzflag.spec index e378e42..d96251d 100644 --- a/bzflag.spec +++ b/bzflag.spec @@ -16,7 +16,7 @@ License: GNU General Public License (GPL) Group: Amusements/Games/3D/Shoot Autoreqprov: on Version: 2.0.8 -Release: 27 +Release: 32 Summary: 3D Networked Multiplayer Tank Battle Game URL: http://BZFlag.org/ Source: %name-%version.tar.bz2 @@ -30,6 +30,7 @@ Patch1: bzflag-decl.diff Patch2: bzflag-no-fsigned-char.patch Patch3: bzflag-char-signedness.patch Patch4: %{name}-%{version}_array-subscript.patch +Patch5: %{name}-%{version}_array-subscript2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq @@ -55,6 +56,7 @@ Authors: %patch2 %patch3 -p1 %patch4 +%patch5 cp %SOURCE2 . %build @@ -110,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT /var/adm/fillup-templates/sysconfig.bzflagserver-bzflag %changelog +* Mon Apr 16 2007 - pgajdos@suse.cz +- fixed 'warning: array subscript is below array bounds' [#229908] +- array_subscript2.patch * Tue Mar 13 2007 - pgajdos@suse.cz - fixed 'warning: array subscript is below array bounds' - array_subscript.patch