workaround potencial memory leak

2 files changed, 40 insertions, 33 deletions

diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index ac99692..8215124 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
@@ -354,9 +354,9 @@ namespace OpenSim.Capabilities.Handlers
             byte[] data = new byte[0];
 
             MemoryStream imgstream = new MemoryStream();
-            Bitmap mTexture = new Bitmap(1, 1);
-            ManagedImage managedImage;
-            Image image = (Image)mTexture;
+            Bitmap mTexture = null;
+            ManagedImage managedImage = null;
+            Image image = null;
 
             try
             {
@@ -365,25 +365,26 @@ namespace OpenSim.Capabilities.Handlers
                 imgstream = new MemoryStream();
 
                 // Decode image to System.Drawing.Image
-                if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image))
+                if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image) && image != null)
                 {
                     // Save to bitmap
                     mTexture = new Bitmap(image);
 
-                    EncoderParameters myEncoderParameters = new EncoderParameters();
-                    myEncoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, 95L);
-
-                    // Save bitmap to stream
-                    ImageCodecInfo codec = GetEncoderInfo("image/" + format);
-                    if (codec != null)
+                    using(EncoderParameters myEncoderParameters = new EncoderParameters())
                     {
-                        mTexture.Save(imgstream, codec, myEncoderParameters);
+                        myEncoderParameters.Param[0] = new EncoderParameter(Encoder.Quality,95L);
+
+                        // Save bitmap to stream
+                        ImageCodecInfo codec = GetEncoderInfo("image/" + format);
+                        if (codec != null)
+                        {
+                            mTexture.Save(imgstream, codec, myEncoderParameters);
                         // Write the stream to a byte array for output
-                        data = imgstream.ToArray();
+                            data = imgstream.ToArray();
+                        }
+                        else
+                            m_log.WarnFormat("[GETTEXTURE]: No such codec {0}", format);
                     }
-                    else
-                        m_log.WarnFormat("[GETTEXTURE]: No such codec {0}", format);
-
                 }
             }
             catch (Exception e)
@@ -399,7 +400,9 @@ namespace OpenSim.Capabilities.Handlers
 
                 if (image != null)
                     image.Dispose();
-
+                
+                if(managedImage != null)
+                    managedImage.Clear();
                 if (imgstream != null)
                 {
                     imgstream.Close();
diff --git a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
index f813471..518f74e 100644
--- a/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureRobustHandler.cs
@@ -359,9 +359,9 @@ namespace OpenSim.Capabilities.Handlers
             byte[] data = new byte[0];
  
             MemoryStream imgstream = new MemoryStream();
-            Bitmap mTexture = new Bitmap(1, 1);
-            ManagedImage managedImage;
-            Image image = (Image)mTexture;
+            Bitmap mTexture = null;
+            ManagedImage managedImage = null;
+            Image image = null;
  
             try
             {
@@ -370,25 +370,26 @@ namespace OpenSim.Capabilities.Handlers
                 imgstream = new MemoryStream();
  
                 // Decode image to System.Drawing.Image
-                if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image))
+                if (OpenJPEG.DecodeToImage(texture.Data, out managedImage, out image) && image != null)
                 {
                     // Save to bitmap
                     mTexture = new Bitmap(image);
- 
-                    EncoderParameters myEncoderParameters = new EncoderParameters();
-                    myEncoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, 95L);
- 
-                    // Save bitmap to stream
-                    ImageCodecInfo codec = GetEncoderInfo("image/" + format);
-                    if (codec != null)
+
+                    using(EncoderParameters myEncoderParameters = new EncoderParameters())
                     {
-                        mTexture.Save(imgstream, codec, myEncoderParameters);
-                        // Write the stream to a byte array for output
-                        data = imgstream.ToArray();
-                    }
-                    else
-                        m_log.WarnFormat("[GETTEXTURE]: No such codec {0}", format);
+                        myEncoderParameters.Param[0] = new EncoderParameter(Encoder.Quality,95L);
  
+                        // Save bitmap to stream
+                        ImageCodecInfo codec = GetEncoderInfo("image/" + format);
+                        if (codec != null)
+                        {
+                            mTexture.Save(imgstream, codec, myEncoderParameters);
+                            // Write the stream to a byte array for output
+                            data = imgstream.ToArray();
+                        }
+                        else
+                            m_log.WarnFormat("[GETTEXTURE]: No such codec {0}", format);
+                    }
                 }
             }
             catch (Exception e)
@@ -405,6 +406,9 @@ namespace OpenSim.Capabilities.Handlers
                 if (image != null)
                     image.Dispose();
  
+                if(managedImage != null)
+                    managedImage.Clear();
+
                 if (imgstream != null)
                 {
                     imgstream.Close();