fixing overrelease and out-of-bounds write, fixes #13725

[wxWidgets.git] / src / common / imagpnm.cpp

diff --git a/src/common/imagpnm.cpp b/src/common/imagpnm.cpp
index aaa30aec58a52af69307b3d94161e6ea0fffa5e4..731220450b67e54121d9216ecd872b9528666191 100644 (file)
--- a/src/common/imagpnm.cpp
+++ b/src/common/imagpnm.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imagpnm.cpp
+// Name:        src/common/imagpnm.cpp

 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$
 // Purpose:     wxImage PNM handler
 // Author:      Sylvain Bougnoux
 // RCS-ID:      $Id$


@@ -11,18 +11,18 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#  include "wx/setup.h"
+    #pragma hdrstop

 #endif
 
 #if wxUSE_IMAGE && wxUSE_PNM
 
 #include "wx/imagpnm.h"
 #endif
 
 #if wxUSE_IMAGE && wxUSE_PNM
 
 #include "wx/imagpnm.h"

-#include "wx/log.h"
-#include "wx/intl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
+

 #include "wx/txtstrm.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/txtstrm.h"
 
 //-----------------------------------------------------------------------------


@@ -69,7 +69,10 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
         case wxT('5'): // RAW Grey
         case wxT('6'): break;
         default:
         case wxT('5'): // RAW Grey
         case wxT('6'): break;
         default:

-            if (verbose) wxLogError(_("PNM: File format is not recognized."));
+            if (verbose)
+            {
+                wxLogError(_("PNM: File format is not recognized."));
+            }

             return false;
     }
 
             return false;
     }
 


@@ -85,7 +88,9 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     if (!ptr)
     {
         if (verbose)
     if (!ptr)
     {
         if (verbose)

+        {

            wxLogError( _("PNM: Couldn't allocate memory.") );
            wxLogError( _("PNM: Couldn't allocate memory.") );

+        }

         return false;
     }
 
         return false;
     }
 


@@ -96,12 +101,17 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
         for (wxUint32 i=0; i<size; ++i)
         {
             value=text_stream.Read32();
         for (wxUint32 i=0; i<size; ++i)
         {
             value=text_stream.Read32();

+            if ( maxval != 255 )
+                value = (255 * value)/maxval;

             *ptr++=(unsigned char)value; // R
             *ptr++=(unsigned char)value; // G
             *ptr++=(unsigned char)value; // B
             if ( !buf_stream )
             {
             *ptr++=(unsigned char)value; // R
             *ptr++=(unsigned char)value; // G
             *ptr++=(unsigned char)value; // B
             if ( !buf_stream )
             {

-                if (verbose) wxLogError(_("PNM: File seems truncated."));
+                if (verbose)
+                {
+                    wxLogError(_("PNM: File seems truncated."));
+                }

                 return false;
             }
         }
                 return false;
             }
         }


@@ -114,11 +124,16 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
             //this is very slow !!!
             //I wonder how we can make any better ?
             value=text_stream.Read32();
             //this is very slow !!!
             //I wonder how we can make any better ?
             value=text_stream.Read32();

+            if ( maxval != 255 )
+                value = (255 * value)/maxval;

             *ptr++=(unsigned char)value;
 
             if ( !buf_stream )
               {
             *ptr++=(unsigned char)value;
 
             if ( !buf_stream )
               {

-                if (verbose) wxLogError(_("PNM: File seems truncated."));
+                if (verbose)
+                {
+                    wxLogError(_("PNM: File seems truncated."));
+                }

                 return false;
               }
           }
                 return false;
               }
           }


@@ -130,18 +145,31 @@ bool wxPNMHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
         for (wxUint32 i=0; i<size; ++i)
         {
             buf_stream.Read(&value,1);
         for (wxUint32 i=0; i<size; ++i)
         {
             buf_stream.Read(&value,1);

+            if ( maxval != 255 )
+                value = (255 * value)/maxval;

             *ptr++=value; // R
             *ptr++=value; // G
             *ptr++=value; // B
             if ( !buf_stream )
             {
             *ptr++=value; // R
             *ptr++=value; // G
             *ptr++=value; // B
             if ( !buf_stream )
             {

-                if (verbose) wxLogError(_("PNM: File seems truncated."));
+                if (verbose)
+                {
+                    wxLogError(_("PNM: File seems truncated."));
+                }

                 return false;
             }
         }
     }
                 return false;
             }
         }
     }

-    if (c=='6') // Raw RGB
-      buf_stream.Read( ptr, 3*width*height );
+
+    if ( c=='6' ) // Raw RGB
+    {
+        buf_stream.Read(ptr, 3*width*height);
+        if ( maxval != 255 )
+        {
+            for ( unsigned i = 0; i < 3*width*height; i++ )
+                ptr[i] = (255 * ptr[i])/maxval;
+        }
+    }

 
     image->SetMask( false );
 
 
     image->SetMask( false );
 


@@ -166,6 +194,7 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream )
 {
     Skip_Comment(stream);
 
 {
     Skip_Comment(stream);
 

+    // it's ok to modify the stream position here

     if ( stream.GetC() == 'P' )
     {
         switch ( stream.GetC() )
     if ( stream.GetC() == 'P' )
     {
         switch ( stream.GetC() )


@@ -184,4 +213,4 @@ bool wxPNMHandler::DoCanRead( wxInputStream& stream )
 
 #endif // wxUSE_STREAMS
 
 
 #endif // wxUSE_STREAMS
 

-#endif // wxUSE_PNM
+#endif // wxUSE_IMAGE && wxUSE_PNM