Index: sources/model/hd/data/post/MHDPostSingleResultData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22 --- sources/model/hd/data/post/MHDPostSingleResultData.cpp (.../MHDPostSingleResultData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/post/MHDPostSingleResultData.cpp (.../MHDPostSingleResultData.cpp) (revision d75408467177729ebe40cf64fc9f3ba6480dad22) @@ -26,11 +26,15 @@ bool MHDPostSingleResult::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mResult )) - if (GetValue(vByteArray, index, _data.mIndex )) - return true ; - else { if(vIndex) *vIndex = index; return false; } - else { if(vIndex) *vIndex = index; return false; } + if ( ! GetValue(vByteArray, index, _data.mResult )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIndex )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; } /*!