Changeset 5290 in orxonox.OLD

Timestamp:

Oct 6, 2005, 11:41:42 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed issue with the overlaping char-arrays in the Shell's Buffer

Location:

trunk/src/lib

Files:

• graphics/text_engine.cc (modified) (1 diff)
• shell/shell_buffer.cc (modified) (2 diffs)

trunk/src/lib/graphics/text_engine.cc

@@ -814 +814 @@
   // first remove all the remaining Texts (if any).
   tList<BaseObject>* textList = ClassList::getList(CL_TEXT);
-  if (text != NULL)
+  if (textList != NULL)
   {
     tIterator<BaseObject>* textIterator = textList->getIterator();

trunk/src/lib/shell/shell_buffer.cc

@@ -134 +134 @@
 void ShellBuffer::addBufferLine(const char* line, va_list arguments)
 {
-  vsprintf(this->bufferArray, line, arguments);
-
   char* inputEnd;
   char* newLineBegin;
   char* newLineEnd;
 
-   // check if we have something left in the buffers
+  // copy the output to the bufferArray
+  vsprintf(this->bufferArray, line, arguments);
+
+  // check if we have something left in the buffers
+  // if so, append the new String to this one.
   if (unlikely(this->keepBuffer))
   {
     strcat(this->keepBufferArray, this->bufferArray);
-    inputEnd = this->keepBufferArray + strlen(this->keepBufferArray);
+    inputEnd = this->keepBufferArray + strlen(this->bufferArray);
     newLineBegin = this->keepBufferArray;
     this->keepBuffer = false;
@@ -154 +156 @@
   }
 
-   // adding all the new Lines
-  while (newLineBegin < inputEnd )
+  // adding all the new Lines
+  while (newLineBegin < inputEnd)
   {
     newLineEnd = strchr(newLineBegin, '\n');
-    if (newLineEnd != NULL && *newLineEnd == '\n')
+    if (likely(newLineEnd != NULL && *newLineEnd == '\n'))
       *newLineEnd = '\0';
     else
     {
-//       newLineEnd = newLineBegin + strlen(newLineBegin);
       unsigned int len = strlen(newLineBegin);
-      strncpy(this->keepBufferArray, newLineBegin, len);
+      char* copyBuffer = new char[len+1];
+      strcpy(copyBuffer, newLineBegin);
+      strncpy(this->keepBufferArray, copyBuffer, len);
+      delete[] copyBuffer;
       this->keepBufferArray[len] = '\0';
       this->keepBuffer = true;