From a66d6becfaf4fef6f4f79d99c21190d1f61a1e64 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 2 Dec 2003 21:38:01 +0000
Subject: [PATCH] From Rune, Added catch for erroneous size specification in
 .dds file.

---
 src/osgPlugins/dds/ReaderWriterDDS.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/osgPlugins/dds/ReaderWriterDDS.cpp b/src/osgPlugins/dds/ReaderWriterDDS.cpp
index 867b66f97..4968f244a 100644
--- a/src/osgPlugins/dds/ReaderWriterDDS.cpp
+++ b/src/osgPlugins/dds/ReaderWriterDDS.cpp
@@ -1,6 +1,6 @@
 /**********************************************************************
  *
- *    FILE:            ReaderWriterdds.cpp
+ *    FILE:           ReaderWriterdds.cpp
  *
  *    DESCRIPTION:    Class for reading a DDS file into an osg::Image.
  *
@@ -9,11 +9,11 @@
  *                    ARB_texture_compression.pdf
  *                    Author: Sébastien Dominé, NVIDIA Corporation
  *
- *    CREATED BY:        Rune Schmidt Jensen, rsj@uni-dk
+ *    CREATED BY:     Rune Schmidt Jensen, rune@schmidt-jensen.com
  *
  *    HISTORY:        Created 31.03.2003
  *
-  **********************************************************************/
+ **********************************************************************/
 
 #include <osg/Texture>
 #include <osg/Notify>
@@ -159,6 +159,10 @@ osg::Image* ReadDDSFile(const char *filename)
     unsigned int size = ddsd.dwMipMapCount > 1 ? ddsd.dwLinearSize * (ddsd.ddpfPixelFormat.dwFourCC==FOURCC_DXT1 ? 2: 4) : ddsd.dwLinearSize;
     //###################unsigned int size = ddsd.dwMipMapCount > 1 ? ddsd.dwLinearSize * 2 : ddsd.dwLinearSize;
 
+	if(size <= 0){
+		osg::notify(osg::WARN)<<"Warning:: dwLinearSize is not defined in dds file, image not loaded."<<std::endl;
+        return NULL;
+	}
     
 	unsigned char* imageData = new unsigned char [size];
     fread(imageData, 1, size, fp);