Check for sufficient room for multi-column character.

Fix to commit 92128dacf8d5db02379e8f872dc50d31c6aaa55f.  The sympton,
reported by Valdis, was overrun of scan -width.

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 1ea5e623fb6767875f7c7a52c5a073a7513060f3..4416b54c012edfbfcb91d401ce0719d26d402fa2 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -299,10 +299,20 @@ cpstripped (charstring_t dest, size_t max, char *str)
        prevCtrl = 0;
 
 #ifdef MULTIBYTE_SUPPORT
        prevCtrl = 0;
 
 #ifdef MULTIBYTE_SUPPORT

-       charstring_push_back_chars (dest, altstr ? altstr : str, char_len, w);
-        max -= w;
-       str += char_len;
-       altstr = NULL;
+       assert(w >= 0);
+       if (max >= (size_t) w) {
+           charstring_push_back_chars (dest, altstr ? altstr : str, char_len, w);
+           max -= w;
+           str += char_len;
+           altstr = NULL;
+       } else {
+           /* Not enough width available for the last character.  Output
+              space(s) to fill. */
+           while (max-- > 0) {
+               charstring_push_back (dest, ' ');
+           }
+           break;
+       }

 #else /* MULTIBYE_SUPPORT */
        charstring_push_back (dest, *str++);
         --max;
 #else /* MULTIBYE_SUPPORT */
        charstring_push_back (dest, *str++);
         --max;

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index bab76b6c1ad3b53a16c633b2f95f4bb3402a9c77..dc2a284c76e55d8bc31f935a814dd9560a7d40a1 100755 (executable)
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -63,6 +63,8 @@ fi
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 

+
+start_test 'RFC 2047 headers'

 if test "$width" -eq 3; then
 cat > "$expected" <<EOF
   11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are looki
 if test "$width" -eq 3; then
 cat > "$expected" <<EOF
   11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are looki


@@ -79,6 +81,7 @@ fi
 run_prog scan -width 80 +inbox 11 > $actual || exit 1
 check "$expected" "$actual"
 
 run_prog scan -width 80 +inbox 11 > $actual || exit 1
 check "$expected" "$actual"
 

+

 #
 # Check decoding with an invalid multibyte sequence.  We skip this test
 # if we don't have iconv support, since it requires converting from one
 #
 # Check decoding with an invalid multibyte sequence.  We skip this test
 # if we don't have iconv support, since it requires converting from one


@@ -86,6 +89,7 @@ check "$expected" "$actual"
 # it's required for the test right after it.
 #
 
 # it's required for the test right after it.
 #
 

+start_test 'invalid multibyte sequence'

 cat >`mhpath new` <<EOF
 From: Test12 <test12@example.com>
 To: Some User <user@example.com>
 cat >`mhpath new` <<EOF
 From: Test12 <test12@example.com>
 To: Some User <user@example.com>


@@ -120,6 +124,7 @@ if test $? -ne 0; then
 fi
 
 # check scan width with a valid multibyte sequence
 fi
 
 # check scan width with a valid multibyte sequence

+start_test 'scan width with a valid multibyte sequence'

 if test "$width" -eq 1; then
     cat >"$expected" <<EOF
   12  12/31 Test12             2013 New Year’s Deals! Start the year right
 if test "$width" -eq 1; then
     cat >"$expected" <<EOF
   12  12/31 Test12             2013 New Year’s Deals! Start the year right


@@ -137,6 +142,7 @@ check "$expected" "$actual"
 
 
 if test "$ICONV_ENABLED" -eq 1; then
 
 
 if test "$ICONV_ENABLED" -eq 1; then

+  start_test 'encoded single quote'

   cat >"$expected" <<EOF
   13  01/13 sender@example.co  <<The Subject: is an encoded single quote, 0x92. 
 EOF
   cat >"$expected" <<EOF
   13  01/13 sender@example.co  <<The Subject: is an encoded single quote, 0x92. 
 EOF


@@ -159,4 +165,23 @@ EOF
 fi
 
 
 fi
 
 

+start_test 'insufficient room for multicolumn character'
+#### This multibyte character requires 2 columns for display, but
+#### only 1 is availble.  cpstripped() used to get this wrong.
+
+cat >"$expected" <<EOF
+ 
+EOF
+
+cat >`mhpath new` <<EOF
+Mime-Version: 1.0
+
+在 Should not see any of this text
+EOF
+
+run_prog scan -format '%{body}' -width 1 last >"$actual"
+check "$expected" "$actual"
+
+
+finish_test

 exit $failed
 exit $failed