* Fixed two memory leaks.

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 2bfa364e1ea80409943ddad0e0d766d5f03a634c..7f72e82db47c3e7913367ffc62cc817280b0a768 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -13,65 +13,108 @@
 #pragma implementation "mstream.h"
 #endif
 
 #pragma implementation "mstream.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 #include <stdlib.h>
 #include <stdlib.h>

-#include "wx/stream.h"
-#include "wx/mstream.h"
-
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_CLASS(wxMemoryStreamBase, wxStream)
-IMPLEMENT_CLASS(wxMemoryInputStream, wxMemoryStreamBase)
-//IMPLEMENT_DYNAMIC_CLASS(wxMemoryOutputStream, wxMemoryStreamBase)
-//IMPLEMENT_DYNAMIC_CLASS(wxMemoryStream, wxMemoryStreamBase)
+#include <wx/stream.h>
+#include <wx/mstream.h>
+
+#ifdef __BORLANDC__
+#pragma hdrstop

 #endif
 
 #endif
 

-wxMemoryStreamBase::wxMemoryStreamBase(char *data, size_t length, int iolimit)
+// ----------------------------------------------------------------------------
+// wxMemoryStreamBase
+// ----------------------------------------------------------------------------
+wxMemoryStreamBase::wxMemoryStreamBase()

 {
 {

-  m_buffer = data;
-  m_iolimit = iolimit;
+  m_buffer = NULL;
+  m_iolimit = 0;

   m_persistent = FALSE;
   m_persistent = FALSE;

-  m_length = length;
-  m_position_i = m_position_o = 0;
+  m_length = 0;

 }
 
 wxMemoryStreamBase::~wxMemoryStreamBase()
 {
 }
 
 wxMemoryStreamBase::~wxMemoryStreamBase()
 {

-  free(m_buffer);
+  if (!m_persistent && m_buffer)
+   free(m_buffer);
+}
+
+bool wxMemoryStreamBase::ChangeBufferSize(size_t new_size)
+{
+  if (m_iolimit == 1)
+    return FALSE;
+
+  m_length = new_size;
+  if (!m_buffer)
+    m_buffer = (char *)malloc(m_length);
+  else
+    m_buffer = (char *)realloc(m_buffer, m_length);
+
+  return (m_buffer != NULL);
+}
+
+// ----------------------------------------------------------------------------
+// wxMemoryInputStream
+// ----------------------------------------------------------------------------
+
+wxMemoryInputStream::wxMemoryInputStream(const char *data, size_t len)
+{
+  m_persistent = TRUE;
+  m_length = len;
+  m_buffer = (char *)data; // It's bad.
+  m_position_i = 0;
+  m_lastread = 0;
+  m_eof = FALSE;
+  m_iolimit = 1;
+
+  m_i_streambuf->SetBufferIO(0);
+}
+
+wxMemoryInputStream::~wxMemoryInputStream()
+{
+}
+
+char wxMemoryInputStream::Peek()
+{
+   // wxStreamBuffer is disabled so just peek the current character.
+
+   return m_buffer[m_position_i];

 }
 
 }
 

-wxInputStream& wxMemoryStreamBase::Read(void *buffer, size_t size)
+size_t wxMemoryInputStream::DoRead(void *buffer, size_t size)

 {
   if (m_iolimit == 2) {
     m_eof = TRUE;
 {
   if (m_iolimit == 2) {
     m_eof = TRUE;

-    return *this;
+    return 0; 

   }
   if (m_position_i+size > m_length)
     size = m_length-m_position_i;
 
   memcpy((void *)((unsigned long)buffer+m_position_i), m_buffer, size);
   m_position_i += size;
   }
   if (m_position_i+size > m_length)
     size = m_length-m_position_i;
 
   memcpy((void *)((unsigned long)buffer+m_position_i), m_buffer, size);
   m_position_i += size;

-  m_lastread = size;

 
 

-  return *this;
+  return size;

 }
 
 }
 

-size_t wxMemoryStreamBase::SeekI(int pos, wxWhenceType whence)
+off_t wxMemoryInputStream::DoSeekInput(off_t pos, wxSeekMode mode)

 {
   if (m_iolimit == 2)
     return 0;
 
 {
   if (m_iolimit == 2)
     return 0;
 

-  switch (whence) {
-  case wxBeginPosition:
+  switch (mode) {
+  case wxFromStart:

     if ((size_t)pos > m_length)
       return m_position_i;
     return (m_position_i = pos);
 
     if ((size_t)pos > m_length)
       return m_position_i;
     return (m_position_i = pos);
 

-  case wxCurrentPosition:
+  case wxFromCurrent:

     if ((size_t)(m_position_i+pos) > m_length)
       return m_position_i;
 
     return (m_position_i += pos);
 
     if ((size_t)(m_position_i+pos) > m_length)
       return m_position_i;
 
     return (m_position_i += pos);
 

-  case wxEndPosition:
+  case wxFromEnd:

     if ((size_t)(m_length-pos) > m_length)
       return m_position_i;
 
     if ((size_t)(m_length-pos) > m_length)
       return m_position_i;
 


@@ -81,44 +124,65 @@ size_t wxMemoryStreamBase::SeekI(int pos, wxWhenceType whence)
   return m_position_i;
 }
 
   return m_position_i;
 }
 

-wxOutputStream& wxMemoryStreamBase::Write(const void *buffer, size_t size)
+// ----------------------------------------------------------------------------
+// wxMemoryOutputStream
+// ----------------------------------------------------------------------------
+
+wxMemoryOutputStream::wxMemoryOutputStream(char *data, size_t len)
+{
+  m_persistent = FALSE;
+  m_buffer = data;
+  m_length = len;
+  m_position_o = 0;
+  m_lastwrite = 0;
+  m_bad = FALSE;
+  m_iolimit = 2;
+
+  m_o_streambuf->SetBufferIO(0);
+}
+
+wxMemoryOutputStream::~wxMemoryOutputStream()
+{
+  Sync();
+}
+
+size_t wxMemoryOutputStream::DoWrite(const void *buffer, size_t size)

 {
   if (m_iolimit == 1) {
     m_bad = TRUE;
 {
   if (m_iolimit == 1) {
     m_bad = TRUE;

-    return *this;
+    return 0;

   }
   
   if (m_position_o+size > m_length)
     if (!ChangeBufferSize(m_position_o+size)) {
       m_bad = TRUE;
   }
   
   if (m_position_o+size > m_length)
     if (!ChangeBufferSize(m_position_o+size)) {
       m_bad = TRUE;

-      return *this;
+      return 0;

     }
 
   memcpy(m_buffer+m_position_o, buffer, size);
   m_position_o += size;
     }
 
   memcpy(m_buffer+m_position_o, buffer, size);
   m_position_o += size;

-  m_lastwrite = size;

 
 

-  return *this;
+  return size;

 }
 
 }
 

-size_t wxMemoryStreamBase::SeekO(int pos, wxWhenceType whence)
+off_t wxMemoryOutputStream::DoSeekOutput(off_t pos, wxSeekMode mode)

 {
 {

-  if (m_iolimit == 2)
+  if (m_iolimit == 1)

     return 0;
 
     return 0;
 

-  switch (whence) {
-  case wxBeginPosition:
+  switch (mode) {
+  case wxFromStart:

     if ((size_t)pos > m_length)
       return m_position_o;
     return (m_position_o = pos);
 
     if ((size_t)pos > m_length)
       return m_position_o;
     return (m_position_o = pos);
 

-  case wxCurrentPosition:
+  case wxFromCurrent:

     if ((size_t)(m_position_o+pos) > m_length)
       return m_position_o;
 
     return (m_position_o += pos);
 
     if ((size_t)(m_position_o+pos) > m_length)
       return m_position_o;
 
     return (m_position_o += pos);
 

-  case wxEndPosition:
+  case wxFromEnd:

     if ((size_t)(m_length-pos) > m_length)
       return m_position_o;
 
     if ((size_t)(m_length-pos) > m_length)
       return m_position_o;
 


@@ -128,13 +192,19 @@ size_t wxMemoryStreamBase::SeekO(int pos, wxWhenceType whence)
   return m_position_o;
 }
 
   return m_position_o;
 }
 

-bool wxMemoryStreamBase::ChangeBufferSize(size_t new_size)
+// ----------------------------------------------------------------------------
+// wxMemoryStream
+// ----------------------------------------------------------------------------
+
+wxMemoryStream::wxMemoryStream(char *data, size_t len)
+  : wxMemoryInputStream(NULL, 0), wxMemoryOutputStream(NULL, 0)

 {
 {

-  m_length = new_size;
-  if (!m_buffer)
-    m_buffer = (char *)malloc(m_length);
-  else
-    m_buffer = (char *)realloc(m_buffer, m_length);
+  m_persistent = FALSE;
+  m_buffer = data;
+  m_length = len;
+  m_iolimit = 0;
+}

 
 

-  return (m_buffer != NULL);
+wxMemoryStream::~wxMemoryStream()
+{

 }
 }