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

[senf.git] / senf / Packets / DefaultBundle / ListOptionTypeParser.cti

diff --git a/senf/Packets/DefaultBundle/ListOptionTypeParser.cti b/senf/Packets/DefaultBundle/ListOptionTypeParser.cti
index 82297ca..48b1651 100644 (file)
--- a/senf/Packets/DefaultBundle/ListOptionTypeParser.cti
+++ b/senf/Packets/DefaultBundle/ListOptionTypeParser.cti
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Philipp.Batroff@fokus.fraunhofer.de
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Philipp Batroff <pug@berlios.de>
 
 /** \file
     \brief ListOptionTypeParser inline template implementation */
@@ -28,9 +33,9 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>
 
 template <class ElementParser, class AuxPolicy>
@@ -44,7 +49,7 @@ template <class Arg>
 prefix_
 senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::
 ListOptionTypeParser_Policy(Arg const & arg)
-    : AuxPolicy(arg) 
+    : AuxPolicy(arg)
 {}
 
 template <class ElementParser, class AuxPolicy>
@@ -80,7 +85,7 @@ senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::init(data_it
     AuxPolicy::aux(0, i, s);
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail::ListOptionTypeParser_Policy<ElementParser,BytesParser>
 
 //constructor
@@ -88,7 +93,7 @@ template <class ElementParser, class AuxPolicy>
 prefix_
 senf::detail::ListOptionTypeParser_Policy<ElementParser,AuxPolicy>::container_policy::
 container_policy(parser_policy const & p)
-    : AuxPolicy(p) 
+    : AuxPolicy(p)
 {}
 
 //destructor
@@ -108,12 +113,16 @@ construct(container_type & c)
     realAux_ = (AuxPolicy::aux(i, c.state()) * 8) + 6;
     safe_data_iterator e = i + realAux_;
     for (n_ = 0; i != e;) {
-        unsigned int elByte = senf::bytes(ElementParser(i, c.state()));
+        size_type elByte;
+        if (i[0] == 0u)
+            elByte = 1;
+        else
+            elByte = senf::bytes(ElementParser(i, c.state()));
         if (((i + elByte) == e) && (i[0] == 0u || i[0] == 1u)) { //check weather last element is padding or not
             realAux_ -= std::distance(i, e);
             c.data().erase(i, e); //delete padding
             e = i; //set end iterator
-        } else{
+        } else {
             ++n_;
             std::advance(i, elByte);
         }
@@ -133,7 +142,7 @@ destruct(container_type & c)
     unsigned int padBytes = 0;
     if (realAux_ == 0)      //if list is empty, 6 padding bytes required!
       padBytes = 6;
-    else{
+    else {
       padBytes = ( (realAux_+2) % 8);
       if (padBytes != 0)
           padBytes = 8 - padBytes;
@@ -278,7 +287,7 @@ raw(container_type const & c, iterator_data const & d)
     return container_type::iterator::get(d).i();
 }
 
-///////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f