Merge pull request #2 from abma/master

fix linking & reapply CVE-2009-3994

25 files changed, 4 insertions, 24 deletions

diff --git a/DevIL/src-IL/include/il_internal.h b/DevIL/src-IL/include/il_internal.h
index 6f976cc1..0dd50674 100644
--- a/DevIL/src-IL/include/il_internal.h
+++ b/DevIL/src-IL/include/il_internal.h
@@ -38,6 +38,7 @@ extern "C" {
 #include <IL/devil_internal_exports.h>
 #include "il_files.h"
 #include "il_endian.h"
+#include "il_manip.h"
 
 #ifndef _WIN32
 	// The Microsoft HD Photo Device Porting Kit has not been ported to anything other
diff --git a/DevIL/src-IL/src/il_bmp.c b/DevIL/src-IL/src/il_bmp.c
index d5b7cd1c..e4719e1c 100644
--- a/DevIL/src-IL/src/il_bmp.c
+++ b/DevIL/src-IL/src/il_bmp.c
@@ -15,7 +15,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_BMP
 #include "il_bmp.h"
-#include "il_manip.h"
 #include "il_endian.h"
 #include <stdio.h>
 void GetShiftFromMask(const ILuint Mask, ILuint * CONST_RESTRICT ShiftLeft, ILuint * CONST_RESTRICT ShiftRight);
diff --git a/DevIL/src-IL/src/il_convbuff.c b/DevIL/src-IL/src/il_convbuff.c
index 4106f960..ff8bfb23 100644
--- a/DevIL/src-IL/src/il_convbuff.c
+++ b/DevIL/src-IL/src/il_convbuff.c
@@ -12,7 +12,6 @@
 
 
 #include "il_internal.h"
-#include "il_manip.h"
 #ifdef ALTIVEC_GCC
 #include "altivec_typeconversion.h"
 #endif
diff --git a/DevIL/src-IL/src/il_convert.c b/DevIL/src-IL/src/il_convert.c
index 8f7099d6..1f72f4f6 100644
--- a/DevIL/src-IL/src/il_convert.c
+++ b/DevIL/src-IL/src/il_convert.c
@@ -12,7 +12,6 @@
 
 
 #include "il_internal.h"
-#include "il_manip.h"
 #include <limits.h>
 
 
diff --git a/DevIL/src-IL/src/il_cut.c b/DevIL/src-IL/src/il_cut.c
index 87dc27ec..100d15ed 100644
--- a/DevIL/src-IL/src/il_cut.c
+++ b/DevIL/src-IL/src/il_cut.c
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_CUT
-#include "il_manip.h"
 #include "il_pal.h"
 #include "il_bits.h"
 
diff --git a/DevIL/src-IL/src/il_dcx.c b/DevIL/src-IL/src/il_dcx.c
index 3e9eb802..ec07e3ff 100644
--- a/DevIL/src-IL/src/il_dcx.c
+++ b/DevIL/src-IL/src/il_dcx.c
@@ -14,7 +14,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_DCX
 #include "il_dcx.h"
-#include "il_manip.h"
 
 
 //! Checks if the file specified in FileName is a valid .dcx file.
diff --git a/DevIL/src-IL/src/il_dds-save.c b/DevIL/src-IL/src/il_dds-save.c
index 9a5d1cab..0e8820c9 100644
--- a/DevIL/src-IL/src/il_dds-save.c
+++ b/DevIL/src-IL/src/il_dds-save.c
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #include "il_dds.h"
-#include "il_manip.h"
 #include <limits.h>
 
 
diff --git a/DevIL/src-IL/src/il_devil.c b/DevIL/src-IL/src/il_devil.c
index 88327dfc..fc2f7b7e 100644
--- a/DevIL/src-IL/src/il_devil.c
+++ b/DevIL/src-IL/src/il_devil.c
@@ -14,7 +14,6 @@
 #include "il_internal.h"
 #include <string.h>
 #include <limits.h>
-#include "il_manip.h"
 
 
 ILAPI ILboolean ILAPIENTRY ilInitImage(ILimage *Image, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, void *Data)
diff --git a/DevIL/src-IL/src/il_dicom.c b/DevIL/src-IL/src/il_dicom.c
index fbba48c4..9fc087de 100644
--- a/DevIL/src-IL/src/il_dicom.c
+++ b/DevIL/src-IL/src/il_dicom.c
@@ -427,9 +427,11 @@ ILboolean GetUID(ILubyte *UID)
 		return IL_FALSE;
 
 	ValLen = GetLittleUShort();
+	if (ValLen > 64)
+		return IL_FALSE;
 	if (iread(UID, ValLen, 1) != 1)
 		return IL_FALSE;
-	UID[64] = 0;  // Just to make sure that our string is terminated.
+	UID[ValLen] = 0;  // Just to make sure that our string is terminated.
 
 	return IL_TRUE;
 }
diff --git a/DevIL/src-IL/src/il_doom.c b/DevIL/src-IL/src/il_doom.c
index 62a67cd6..d032f24d 100644
--- a/DevIL/src-IL/src/il_doom.c
+++ b/DevIL/src-IL/src/il_doom.c
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_DOOM
-#include "il_manip.h"
 #include "il_pal.h"
 #include "il_doompal.h"
 
diff --git a/DevIL/src-IL/src/il_jpeg.c b/DevIL/src-IL/src/il_jpeg.c
index 0e81d0bf..f484c1d7 100644
--- a/DevIL/src-IL/src/il_jpeg.c
+++ b/DevIL/src-IL/src/il_jpeg.c
@@ -44,7 +44,6 @@
 	#endif
 
 #include "il_jpeg.h"
-#include "il_manip.h"
 #include <setjmp.h>
 
 
diff --git a/DevIL/src-IL/src/il_manip.c b/DevIL/src-IL/src/il_manip.c
index d244cf71..c94b12c5 100644
--- a/DevIL/src-IL/src/il_manip.c
+++ b/DevIL/src-IL/src/il_manip.c
@@ -11,7 +11,6 @@
 //-----------------------------------------------------------------------------
 
 #include "il_internal.h"
-#include "il_manip.h"
 
 
 ILAPI void ILAPIENTRY iFlipBuffer(ILubyte *buff, ILuint depth, ILuint line_size, ILuint line_num)
diff --git a/DevIL/src-IL/src/il_nvidia.cpp b/DevIL/src-IL/src/il_nvidia.cpp
index e9492546..d82167f2 100644
--- a/DevIL/src-IL/src/il_nvidia.cpp
+++ b/DevIL/src-IL/src/il_nvidia.cpp
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #include "il_dds.h"
-#include "il_manip.h"
 #include <limits.h>
 
 
diff --git a/DevIL/src-IL/src/il_pcd.c b/DevIL/src-IL/src/il_pcd.c
index 35890426..8c588398 100644
--- a/DevIL/src-IL/src/il_pcd.c
+++ b/DevIL/src-IL/src/il_pcd.c
@@ -15,7 +15,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_PCD
-#include "il_manip.h"
 
 
 ILboolean iLoadPcdInternal(void);
diff --git a/DevIL/src-IL/src/il_pcx.c b/DevIL/src-IL/src/il_pcx.c
index 6ab6ace7..bce1387c 100644
--- a/DevIL/src-IL/src/il_pcx.c
+++ b/DevIL/src-IL/src/il_pcx.c
@@ -14,7 +14,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_PCX
 #include "il_pcx.h"
-#include "il_manip.h"
 
 
 //! Checks if the file specified in FileName is a valid .pcx file.
diff --git a/DevIL/src-IL/src/il_pic.c b/DevIL/src-IL/src/il_pic.c
index cc8f3958..85af4d4e 100644
--- a/DevIL/src-IL/src/il_pic.c
+++ b/DevIL/src-IL/src/il_pic.c
@@ -15,7 +15,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_PIC
 #include "il_pic.h"
-#include "il_manip.h"
 #include <string.h>
 
 
diff --git a/DevIL/src-IL/src/il_pix.c b/DevIL/src-IL/src/il_pix.c
index 1a30505f..2f1b070d 100644
--- a/DevIL/src-IL/src/il_pix.c
+++ b/DevIL/src-IL/src/il_pix.c
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_PIX
-#include "il_manip.h"
 #include "il_endian.h"
 
 
diff --git a/DevIL/src-IL/src/il_png.c b/DevIL/src-IL/src/il_png.c
index d5b627e3..da9517d5 100644
--- a/DevIL/src-IL/src/il_png.c
+++ b/DevIL/src-IL/src/il_png.c
@@ -19,7 +19,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_PNG
 #include <png.h>
-#include "il_manip.h"
 #include <stdlib.h>
 #if PNG_LIBPNG_VER < 10200
 	#warning DevIL was designed with libpng 1.2.0 or higher in mind.  Consider upgrading at www.libpng.org.
diff --git a/DevIL/src-IL/src/il_pnm.c b/DevIL/src-IL/src/il_pnm.c
index 4c60f263..a46fe4c4 100644
--- a/DevIL/src-IL/src/il_pnm.c
+++ b/DevIL/src-IL/src/il_pnm.c
@@ -17,7 +17,6 @@
 #include "il_pnm.h"
 #include <limits.h>  // for maximum values
 #include <ctype.h>
-#include "il_manip.h"
 #include "il_bits.h"
 
 // According to the ppm specs, it's 70, but PSP
diff --git a/DevIL/src-IL/src/il_pxr.c b/DevIL/src-IL/src/il_pxr.c
index 8e635f0a..b185003e 100644
--- a/DevIL/src-IL/src/il_pxr.c
+++ b/DevIL/src-IL/src/il_pxr.c
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_PXR
-#include "il_manip.h"
 #include "il_endian.h"
 
 
diff --git a/DevIL/src-IL/src/il_rawdata.c b/DevIL/src-IL/src/il_rawdata.c
index 1bda0bd7..8cfce003 100644
--- a/DevIL/src-IL/src/il_rawdata.c
+++ b/DevIL/src-IL/src/il_rawdata.c
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 //#ifndef IL_NO_DATA
-#include "il_manip.h"
 
 
 ILboolean iLoadDataInternal(ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp);
diff --git a/DevIL/src-IL/src/il_sgi.c b/DevIL/src-IL/src/il_sgi.c
index 45dc40bb..17700ed4 100644
--- a/DevIL/src-IL/src/il_sgi.c
+++ b/DevIL/src-IL/src/il_sgi.c
@@ -13,7 +13,6 @@
 #include "il_internal.h"
 #ifndef IL_NO_SGI
 #include "il_sgi.h"
-#include "il_manip.h"
 #include <limits.h>
 
 static char *FName = NULL;
diff --git a/DevIL/src-IL/src/il_targa.c b/DevIL/src-IL/src/il_targa.c
index 87909c63..4732df9c 100644
--- a/DevIL/src-IL/src/il_targa.c
+++ b/DevIL/src-IL/src/il_targa.c
@@ -16,7 +16,6 @@
 #include "il_targa.h"
 //#include <time.h>  // for ilMakeString()
 #include <string.h>
-#include "il_manip.h"
 #include "il_bits.h"
 
 #ifdef DJGPP
diff --git a/DevIL/src-IL/src/il_tiff.c b/DevIL/src-IL/src/il_tiff.c
index d2e83af7..fe48b55d 100644
--- a/DevIL/src-IL/src/il_tiff.c
+++ b/DevIL/src-IL/src/il_tiff.c
@@ -17,7 +17,6 @@
 #include "tiffio.h"
 
 #include <time.h>
-#include "il_manip.h"
 
 #define MAGIC_HEADER1	0x4949
 #define MAGIC_HEADER2	0x4D4D
diff --git a/DevIL/src-IL/src/il_wal.c b/DevIL/src-IL/src/il_wal.c
index 82e5f1a0..67f8117c 100644
--- a/DevIL/src-IL/src/il_wal.c
+++ b/DevIL/src-IL/src/il_wal.c
@@ -13,7 +13,6 @@
 
 #include "il_internal.h"
 #ifndef IL_NO_WAL
-#include "il_manip.h"
 #include "il_q2pal.h"