Only compile wxStd{Input,Output}Stream if wxUSE_STREAMS==1.

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

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 0581f926fce754a21200a69e0c08e8318ef9d37e..09a4612cbfdb76d203d19852e00cce996e1e50fd 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -23,13 +23,12 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/palette.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/palette.h"

+    #include "wx/hash.h"
+    #include "wx/module.h"

 #endif
 
 #include "wx/imagpcx.h"
 #include "wx/wfstream.h"
 #endif
 
 #include "wx/imagpcx.h"
 #include "wx/wfstream.h"

-#include "wx/module.h"
-
-#include "wx/hash.h"

 
 //-----------------------------------------------------------------------------
 // wxPCXHandler
 
 //-----------------------------------------------------------------------------
 // wxPCXHandler


@@ -88,17 +87,15 @@ void RLEencode(unsigned char *p, unsigned int size, wxOutputStream& s)
 
 void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s)
 {
 
 void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s)
 {

-    unsigned int i, data, cont;
-

     // Read 'size' bytes. The PCX official specs say there will be
     // a decoding break at the end of each scanline (but not at the
     // end of each plane inside a scanline). Only use this function
     // to read one or more _complete_ scanlines. Else, more than
     // 'size' bytes might be read and the buffer might overflow.
 
     // Read 'size' bytes. The PCX official specs say there will be
     // a decoding break at the end of each scanline (but not at the
     // end of each plane inside a scanline). Only use this function
     // to read one or more _complete_ scanlines. Else, more than
     // 'size' bytes might be read and the buffer might overflow.
 

-    while (size > 0)
+    while (size != 0)

     {
     {

-        data = (unsigned char)s.GetC();
+        unsigned int data = (unsigned char)s.GetC();

 
         // If ((data & 0xC0) != 0xC0), then the value read is a data
         // byte. Else, it is a counter (cont = val & 0x3F) and the
 
         // If ((data & 0xC0) != 0xC0), then the value read is a data
         // byte. Else, it is a counter (cont = val & 0x3F) and the


@@ -111,9 +108,11 @@ void RLEdecode(unsigned char *p, unsigned int size, wxInputStream& s)
         }
         else
         {
         }
         else
         {

-            cont = data & 0x3F;
+            unsigned int cont = data & 0x3F;
+            if (cont > size) // can happen only if the file is malformed
+                break;

             data = (unsigned char)s.GetC();
             data = (unsigned char)s.GetC();

-            for (i = 1; i <= cont; i++)
+            for (unsigned int i = 1; i <= cont; i++)

                 *(p++) = (unsigned char)data;
             size -= cont;
         }
                 *(p++) = (unsigned char)data;
             size -= cont;
         }


@@ -440,7 +439,9 @@ bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     if (!CanRead(stream))
     {
         if (verbose)
     if (!CanRead(stream))
     {
         if (verbose)

+        {

             wxLogError(_("PCX: this is not a PCX file."));
             wxLogError(_("PCX: this is not a PCX file."));

+        }

 
         return false;
     }
 
         return false;
     }


@@ -488,7 +489,7 @@ bool wxPCXHandler::SaveFile( wxImage *image, wxOutputStream& stream, bool verbos
 
 bool wxPCXHandler::DoCanRead( wxInputStream& stream )
 {
 
 bool wxPCXHandler::DoCanRead( wxInputStream& stream )
 {

-    unsigned char c = stream.GetC();
+    unsigned char c = stream.GetC();     // it's ok to modify the stream position here

     if ( !stream )
         return false;
 
     if ( !stream )
         return false;