Changeset 2343 for code/branches/objecthierarchy2/src

Timestamp:

Dec 4, 2008, 8:13:58 PM (16 years ago)

Author:

rgrieder

Message:

Fixed a segfault bug than occurred when producing debug output after the Shell has been destroyed. The reason was that the Shell provides an OutputBuffer itself, so when the Shell gets destroyed, it has to set the fallback buffer again to the OutputHandler.

Location:

code/branches/objecthierarchy2/src

Files:

• core/Shell.cc (modified) (2 diffs)
• util/OutputHandler.cc (modified) (1 diff)
• util/OutputHandler.h (modified) (1 diff)

code/branches/objecthierarchy2/src/core/Shell.cc

@@ -75 +75 @@
 
         this->outputBuffer_.registerListener(this);
-        OutputHandler::getOutStream().setOutputBuffer(this->outputBuffer_);
+        OutputHandler::getOutStream().setOutputBuffer(&this->outputBuffer_);
 
         this->setConfigValues();
@@ -84 +84 @@
     Shell::~Shell()
     {
+        OutputHandler::getOutStream().setOutputBuffer(0);
         if (this->inputBuffer_)
             delete this->inputBuffer_;

code/branches/objecthierarchy2/src/util/OutputHandler.cc

@@ -100 +100 @@
         @param buffer The OutputBuffer
     */
-    void OutputHandler::setOutputBuffer(OutputBuffer& buffer)
-    {
-        buffer.getStream() >> this->outputBuffer_->getStream().rdbuf();
-        this->outputBuffer_ = &buffer;
+    void OutputHandler::setOutputBuffer(OutputBuffer* buffer)
+    {
+        if (buffer == NULL)
+            this->outputBuffer_ = &this->fallbackBuffer_;
+        else
+        {
+            buffer->getStream() >> this->outputBuffer_->getStream().rdbuf();
+            this->outputBuffer_ = buffer;
+        }
     }
 

code/branches/objecthierarchy2/src/util/OutputHandler.h

@@ -101 +101 @@
             static int getSoftDebugLevel(OutputHandler::OutputDevice device = OutputHandler::LD_All);
 
-            void setOutputBuffer(OutputBuffer& buffer);
+            void setOutputBuffer(OutputBuffer* buffer);
 
             template <class T>