Fix a potential array under/over run bug.

diff --git a/SimGear.dsp b/SimGear.dsp
index 76f944bf0924d65554806ed97baac5cd1b0f3e05..2485ab3be6fb713422aaa32ecae1842cd407bed2 100644 (file)
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "\usr\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2  /I "." /I ".." /I ".\SimGear" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -64,7 +64,7 @@ LINK32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /GX /ZI /Od /I "\usr\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "HAVE_CONFIG_H" /FR /FD /GZ /c\r
+# ADD CPP /nologo /W3 /GX /ZI /Od  /I "." /I ".." /I ".\SimGear" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "HAVE_CONFIG_H" /FR /FD /GZ /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -80,18 +80,6 @@ LINK32=link.exe -lib
 \r
 # Name "SimGear - Win32 Release"\r
 # Name "SimGear - Win32 Debug"\r
-# Begin Group "Source Files"\r
-\r
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
-# End Group\r
-# Begin Group "Header Files"\r
-\r
-# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
-# End Group\r
-# Begin Group "Resource Files"\r
-\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
-# End Group\r
 # Begin Group "Lib_sgbucket"\r
 \r
 # PROP Default_Filter ""\r
@@ -973,6 +961,21 @@ SOURCE=.\simgear\screen\screen-dump.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\screen\tr.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgscreen"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgscreen"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\screen\win32-printer.h\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1113,25 +1116,6 @@ SOURCE=.\simgear\sky\stars.cxx
 \r
 !ENDIF \r
 \r
-# End Source File\r
-# End Group\r
-# Begin Group "Lib_sgthreads"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=.\simgear\threads\SGThread.cxx\r
-\r
-!IF  "$(CFG)" == "SimGear - Win32 Release"\r
-\r
-# PROP Intermediate_Dir "Release\Lib_sgthreads"\r
-\r
-!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
-\r
-# PROP Intermediate_Dir "Debug\Lib_sgthreads"\r
-\r
-!ENDIF \r
-\r
 # End Source File\r
 # End Group\r
 # Begin Group "Lib_sgtiming"\r

diff --git a/simgear/math/interpolater.cxx b/simgear/math/interpolater.cxx
index d3d743509d7611db4a9d8bbfb44042f9f31a0210..ccb71d6be5b783e5aea6e06750040e5e106ba306 100644 (file)
--- a/simgear/math/interpolater.cxx
+++ b/simgear/math/interpolater.cxx
@@ -83,8 +83,9 @@ double SGInterpTable::interpolate(double x) const
     int i;
     double y;
 
-    if (size == 0.0)
+    if (size == 0.0) {
       return 0.0;
+    }
 
     i = 0;
 
@@ -96,14 +97,14 @@ double SGInterpTable::interpolate(double x) const
 
     // printf ("i = %d ", i);
 
-    if ( (i == 0) && (x < table[0].ind) ) {
+    if ( i <= 0 ) {
        SG_LOG( SG_MATH, SG_DEBUG, 
                "interpolate(): lookup error, x to small = " << x );
        return table[0].dep;
     }
 
     // cout << " table[size-1].ind = " << table[size-1].ind << endl;
-    if ( x > table[size-1].ind ) {
+    if ( i >= size ) {
        SG_LOG( SG_MATH, SG_DEBUG, 
                "interpolate(): lookup error, x to big = " << x );
        return table[size-1].dep;