[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [dferry] serialization: Arguments::Reader::skipCurrentAggregate(): fix infinite loop on error.
From:       Andreas Hartmetz <ahartmetz () gmail ! com>
Date:       2016-10-19 17:44:38
Message-ID: E1bwuus-00036N-GK () code ! kde ! org
[Download RAW message or body]

Git commit 652bdb1334b5005823c7b333584fb193439f92cb by Andreas Hartmetz.
Committed on 19/10/2016 at 00:18.
Pushed by ahartmetz into branch 'master'.

Arguments::Reader::skipCurrentAggregate(): fix infinite loop on error.

M  +3    -1    serialization/arguments.cpp

http://commits.kde.org/dferry/652bdb1334b5005823c7b333584fb193439f92cb

diff --git a/serialization/arguments.cpp b/serialization/arguments.cpp
index 350a45f..bfcbde0 100644
--- a/serialization/arguments.cpp
+++ b/serialization/arguments.cpp
@@ -1748,11 +1748,13 @@ void Arguments::Reader::skipCurrentAggregate()
         case Arguments::NeedMoreData:
             // TODO handle this properly: rewind the state to before the aggregate - \
or get fancy and support  // resuming, but that is going to get really ugly
+            // fall through
         default:
             m_state = InvalidData;
             // TODO m_error =
-            break;
+            // fall through
         case Arguments::InvalidData:
+            isDone = true;
             break;
         }
     }


[prev in list] [next in list] [prev in thread] [next in thread]