Patch from Julian Foad:

Remove a hack that originally worked around a buffer overflow
elsewhere in the file.  The buffer overflow was fixed long ago, but
the hack was not removed.

diff --git a/simgear/timing/timezone.cxx b/simgear/timing/timezone.cxx
index 29ef5df0ef5f2c865a21f7ff145651b432f33572..41c596e852f7a4f8c571426a2ab9bb26652c7fbb 100644 (file)
--- a/simgear/timing/timezone.cxx
+++ b/simgear/timing/timezone.cxx
@@ -137,17 +137,12 @@ TimezoneContainer::TimezoneContainer(const char *filename)
             if (feof(infile)) {
                 break;
             }
-#ifdef _MSC_VER
-            if( buffer[0] == '#' )
-               continue;
-#else
             for (char *p = buffer; *p; p++) {
                 if (*p == '#') {
                     *p = 0;
                     break;
                 }    
             }
-#endif
             if (buffer[0]) {
                 data.push_back(new Timezone(buffer));
             }