From: Florian Krohm <florian@eich-krohm.de>
Date: Sat, 4 Aug 2012 03:29:22 +0000 (+0000)
Subject: Fix a cut'n paste error. One byte was uninitialised. Now fixed.
X-Git-Tag: svn/VALGRIND_3_8_0~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c4dcca7d8c4fb233e319d28042b0dd351bacd76;p=thirdparty%2Fvalgrind.git

Fix a cut'n paste error. One byte was uninitialised. Now fixed.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12826
---

diff --git a/none/tests/s390x/cu12.c b/none/tests/s390x/cu12.c
index 8badb2ac6d..128111807d 100644
--- a/none/tests/s390x/cu12.c
+++ b/none/tests/s390x/cu12.c
@@ -444,9 +444,10 @@ convert_4_bytes(void)
    f0[1] = 0xc0;  // invalid  because outside [0x90 .. 0xbf]
    run_test(buff, sizeof buff, f0, sizeof f0);
 
-   f4[0] = 0xed;  // valid
+   f4[0] = 0xf4;  // valid
    f4[1] = 0x7f;  // invalid  because outside [0x80 .. 0x8f]
    f4[2] = 0x80;  // valid
+   f4[3] = 0x80;  // valid
    run_test(buff, sizeof buff, f4, sizeof f4);
    f4[1] = 0x90;  // invalid  because outside [0x80 .. 0x9f]
    run_test(buff, sizeof buff, f4, sizeof f4);
diff --git a/none/tests/s390x/cu12.stdout.exp b/none/tests/s390x/cu12.stdout.exp
index 0f570b784c..59c5dc91c3 100644
--- a/none/tests/s390x/cu12.stdout.exp
+++ b/none/tests/s390x/cu12.stdout.exp
@@ -989,13 +989,13 @@ UTF16:  dbc0 dc00
   cc = 0
   dst address difference: 4  dst len: 1996
   src address difference: 4  src len: 0
-UTF8:   ed 7f 80 00
-UTF16:  dfc0 0000
+UTF8:   f4 7f 80 80
+UTF16:  d8bc dc00
   cc = 0
   dst address difference: 4  dst len: 1996
   src address difference: 4  src len: 0
-UTF8:   ed 90 80 00
-UTF16:  d400 0000
+UTF8:   f4 90 80 80
+UTF16:  d800 dc00
   cc = 0
   dst address difference: 4  dst len: 1996
   src address difference: 4  src len: 0
diff --git a/none/tests/s390x/cu12_1.stdout.exp b/none/tests/s390x/cu12_1.stdout.exp
index 414232612d..d5a616fe8f 100644
--- a/none/tests/s390x/cu12_1.stdout.exp
+++ b/none/tests/s390x/cu12_1.stdout.exp
@@ -989,16 +989,16 @@ UTF16:  <none>
   cc = 2
   dst address difference: 0  dst len: 2000
   src address difference: 0  src len: 4
-UTF8:   ed 7f 80 00
+UTF8:   f4 7f 80 80
+UTF16:  <none>
+  cc = 2
+  dst address difference: 0  dst len: 2000
+  src address difference: 0  src len: 4
+UTF8:   f4 90 80 80
 UTF16:  <none>
   cc = 2
   dst address difference: 0  dst len: 2000
   src address difference: 0  src len: 4
-UTF8:   ed 90 80 00
-UTF16:  d400 0000
-  cc = 0
-  dst address difference: 4  dst len: 1996
-  src address difference: 4  src len: 0
 UTF8:   f1 7f 80 80
 UTF16:  <none>
   cc = 2