g++/final: don't add extra code to check for buffer overflows (-fno-stack-protector)

[senf.git] / senf / Utils / Console / Server.cc

diff --git a/senf/Utils/Console/Server.cc b/senf/Utils/Console/Server.cc
index aef6bc5..7ea4bf1 100644 (file)
--- a/senf/Utils/Console/Server.cc
+++ b/senf/Utils/Console/Server.cc
@@ -56,7 +56,7 @@
 namespace {
     senf::console::SysInfo::Proxy addSysInfo (
             "SENF: The Simple and Extensible Network Framework\n"
-            "  © 2006-2011 Fraunhofer Institute for Open Communication Systems, Network Research\n"
+            "  (c) 2006-2011 Fraunhofer Institute for Open Communication Systems (FOKUS)\n"
             "  Contact: senf-dev@lists.berlios.de\n"
             "  Version: " SENF_LIB_VERSION " Revision number: " SENF_REVISION "\n"
             "  Build-type: " BUILD_TYPE ", SenfLog compile time limit: " +
@@ -262,7 +262,7 @@ senf::console::detail::NoninteractiveClientReader::streamBufferMaxSize()
 
 prefix_ void senf::console::detail::NoninteractiveClientReader::v_write(std::string const & data)
 {
-    if( sendQueue_.size() > streamBufferMaxSize_)
+    if (sendQueue_.size() > streamBufferMaxSize_)
         return;
     sendQueue_.insert( sendQueue_.end(), data.begin(), data.end());
     writeHandler(scheduler::FdEvent::EV_WRITE);
@@ -415,7 +415,9 @@ prefix_ std::string::size_type senf::console::Client::handleInput(std::string da
         if (i != std::string::npos) {
             backtrace_ = msg.substr(0,i);
             msg = msg.substr(i+4);
-        } else
+        } else {
+            backtrace_.clear();
+        }
 
         stream() << msg << std::endl;
     }