[Lsb-messages] /var/www/bzr/lsb/devel/olver-core-tests r80: Bug 3528, util/assert/error, test suite deficiency

[RomanZybinphoenix at ispras.ru]

------------------------------------------------------------
revno: 80
committer: Roman Zybin phoenix at ispras.ru
branch nick: olver-core-tests
timestamp: Thu 2012-08-23 20:33:28 +0400
message:
  Bug 3528, util/assert/error, test suite deficiency
modified:
  src/model/util/assert/assert_model.sec
-------------- next part --------------
=== modified file 'src/model/util/assert/assert_model.sec'
--- a/src/model/util/assert/assert_model.sec	2009-08-25 16:37:01 +0000
+++ b/src/model/util/assert/assert_model.sec	2012-08-23 16:33:28 +0000
@@ -866,13 +866,15 @@
     regExp = create_CString( "[^:]*" );
     if ( equals( substring_CString( expectedResult, 0, 5 ), regExp ) ) {
         modifyExpectedResult( funcName, substringFrom_CString( expectedResult, 5 ) );
+        expectedResult = getExpectedResult( funcName );
         if ( ( pos = indexOfChar_CString( errput, ':' ) ) != -1 ) { errput = substringFrom_CString( errput, pos ); }
     }
     // [0123456789]*
     regExp = create_CString( "[0123456789]*" );
     if ( ( pos = lastIndexOfCStringC_String( expectedResult, regExp ) ) != -1 ) {
         modifyExpectedResult( funcName, cutOffSubstring_CString( expectedResult, pos, pos + length_CString( regExp ) ) );
-        errput = cutOffSubstring_CString( errput, pos, length_CString( errput ) - 1 ); // -1 for last \n
+        if (pos < length_CString( errput ))
+            errput = cutOffSubstring_CString( errput, pos, length_CString( errput ) - 1 ); // -1 for last \n
     }
     verdict = checkExpectedResult( funcName, errput, "all_print" );
     // "close" data