Replaced use of snprintf() with memcpy()/memmove().

gcc 10 noticed overlap of source and destination in snprintf() args.

diff --git a/test/dist/test-dist b/test/dist/test-dist
index d3f6279eea6972445a1caa8b3268971ab062327b..722d87193ce86e6f2d21262909041fc77d5c4dc1 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -70,6 +70,7 @@ test_dist ()
 
 
 # check -help
 
 
 # check -help

+start_test "-help"

 cat >"$expected" <<EOF
 Usage: dist [+folder] [msg] [switches]
   switches are:
 cat >"$expected" <<EOF
 Usage: dist [+folder] [msg] [switches]
   switches are:


@@ -98,6 +99,7 @@ dist -help 2>&1 | sed '/^$/,$d' >"$actual"
 check "$expected" "$actual"
 
 # check -version
 check "$expected" "$actual"
 
 # check -version

+start_test "-version"

 case `dist -v` in
   dist\ --*) ;;
   *        ) printf '%s: dist -v generated unexpected output\n' "$0" >&2
 case `dist -v` in
   dist\ --*) ;;
   *        ) printf '%s: dist -v generated unexpected output\n' "$0" >&2


@@ -105,6 +107,7 @@ case `dist -v` in
 esac
 
 # check unknown switch
 esac
 
 # check unknown switch

+start_test "unknown switch"

 run_test "dist -nonexistent" 'dist: -nonexistent unknown'
 
 folder +outbox -create -fast >/dev/null
 run_test "dist -nonexistent" 'dist: -nonexistent unknown'
 
 folder +outbox -create -fast >/dev/null


@@ -114,6 +117,7 @@ folder +inbox -fast 1 >/dev/null
 # looks correct.
 
 # check basic dist operation, including -noedit and -to
 # looks correct.
 
 # check basic dist operation, including -noedit and -to

+start_test "basic dist operation, including -noedit and -to"

 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>


@@ -130,6 +134,7 @@ EOF
 test_dist -noedit -to somebody@example.com
 
 # check +folder and msg
 test_dist -noedit -to somebody@example.com
 
 # check +folder and msg

+start_test "+folder and msg"

 folder +outbox -fast >/dev/null
 
 cat >"$expected" <<EOF
 folder +outbox -fast >/dev/null
 
 cat >"$expected" <<EOF


@@ -148,6 +153,7 @@ EOF
 test_dist +inbox 1 -noedit -to somebody@example.com
 
 # check -form
 test_dist +inbox 1 -noedit -to somebody@example.com
 
 # check -form

+start_test "-form"

 cat >"${MH_TEST_DIR}/Mail/distform" <<'EOF'
 Resent-From: me@example.com
 Resent-To: you@example.com
 cat >"${MH_TEST_DIR}/Mail/distform" <<'EOF'
 Resent-From: me@example.com
 Resent-To: you@example.com


@@ -171,6 +177,7 @@ test_dist 1 -noedit -form "${MH_TEST_DIR}"/Mail/distform
 rm "${MH_TEST_DIR}"/Mail/distform
 
 # check -annotate
 rm "${MH_TEST_DIR}"/Mail/distform
 
 # check -annotate

+start_test "-annotate"

 cat >"$expected" <<EOF
 From: Test2 <test2@example.com>
 To: Some User <user@example.com>
 cat >"$expected" <<EOF
 From: Test2 <test2@example.com>
 To: Some User <user@example.com>


@@ -218,6 +225,7 @@ sed -e 's/^Resent:.*:.*/Resent:/' "${MH_TEST_DIR}"/Mail/inbox/2 >"$actual"
 check "$expected" "$actual"
 
 # check -noannotate
 check "$expected" "$actual"
 
 # check -noannotate

+start_test "-noannotate"

 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>


@@ -248,6 +256,7 @@ check "${MH_TEST_DIR}"/Mail/inbox/1 "$expected" 'keep first'
 check_for_hard_links
 if [ $hard_links_supported -eq 1 ]; then
   # check -noinplace
 check_for_hard_links
 if [ $hard_links_supported -eq 1 ]; then
   # check -noinplace

+  start_test "-noinplace"

   # Hard link the message and verify that the new one doesn't get annotated.
   cp "${MH_TEST_DIR}/Mail/inbox/8" "${MH_TEST_DIR}/Mail/inbox/8.copy"
   ln "${MH_TEST_DIR}/Mail/inbox/8" "${MH_TEST_DIR}/Mail/inbox/8.link"
   # Hard link the message and verify that the new one doesn't get annotated.
   cp "${MH_TEST_DIR}/Mail/inbox/8" "${MH_TEST_DIR}/Mail/inbox/8.copy"
   ln "${MH_TEST_DIR}/Mail/inbox/8" "${MH_TEST_DIR}/Mail/inbox/8.link"


@@ -269,6 +278,7 @@ EOF
     'keep first'
 
   # check -inplace
     'keep first'
 
   # check -inplace

+  start_test "-inplace"

   # Hard link the message and verify that the new one does get annotated.
   ln "${MH_TEST_DIR}/Mail/inbox/9" "${MH_TEST_DIR}/Mail/inbox/9.link"
   cat >"$expected" <<EOF
   # Hard link the message and verify that the new one does get annotated.
   ln "${MH_TEST_DIR}/Mail/inbox/9" "${MH_TEST_DIR}/Mail/inbox/9.link"
   cat >"$expected" <<EOF


@@ -288,6 +298,7 @@ EOF
 fi
 
 # check -draftfolder
 fi
 
 # check -draftfolder

+start_test "-draftfolder"

 cat >"$expected" <<EOF
 From: Test3 <test3@example.com>
 To: Some User <user@example.com>
 cat >"$expected" <<EOF
 From: Test3 <test3@example.com>
 To: Some User <user@example.com>


@@ -304,6 +315,7 @@ EOF
 test_dist 3 -noedit -to somebody@example.com -draftfolder drafts
 
 # check -draftmsg
 test_dist 3 -noedit -to somebody@example.com -draftfolder drafts
 
 # check -draftmsg

+start_test "-draftmsg"

 cat >"$expected" <<EOF
 From: Test3 <test3@example.com>
 To: Some User <user@example.com>
 cat >"$expected" <<EOF
 From: Test3 <test3@example.com>
 To: Some User <user@example.com>


@@ -321,6 +333,7 @@ touch $MH_TEST_DIR/Mail/drafts/3
 test_dist 3 -noedit -to somebody@example.com -draftfolder drafts -draftmessage 2
 
 # check -nodraftfolder
 test_dist 3 -noedit -to somebody@example.com -draftfolder drafts -draftmessage 2
 
 # check -nodraftfolder

+start_test "-nodraftfolder"

 cat >"$expected" <<EOF
 From: Test3 <test3@example.com>
 To: Some User <user@example.com>
 cat >"$expected" <<EOF
 From: Test3 <test3@example.com>
 To: Some User <user@example.com>


@@ -342,6 +355,7 @@ if test -d "${MH_TEST_DIR}/Mail/nonexistent"; then
 fi
 
 # check -from
 fi
 
 # check -from

+start_test "-from"

 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>


@@ -358,6 +372,7 @@ EOF
 test_dist 1 -noedit -to somebody@example.com -from me@example.com
 
 # check -cc
 test_dist 1 -noedit -to somebody@example.com -from me@example.com
 
 # check -cc

+start_test "-cc"

 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>


@@ -375,6 +390,7 @@ EOF
 test_dist 1 -noedit -to somebody@example.com -cc cc@example.com
 
 # check -fcc
 test_dist 1 -noedit -to somebody@example.com -cc cc@example.com
 
 # check -fcc

+start_test "-fcc"

 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>


@@ -391,6 +407,8 @@ EOF
 test_dist 1 -noedit -to somebody@example.com -fcc outbox
 run_test 'scan +outbox -width 6' '   1  '
 
 test_dist 1 -noedit -to somebody@example.com -fcc outbox
 run_test 'scan +outbox -width 6' '   1  '
 

+# check -fcc with +
+start_test "-fcc with +"

 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>
 cat >"$expected" <<EOF
 From: Test1 <test1@example.com>
 To: Some User <user@example.com>


@@ -407,10 +425,33 @@ EOF
 test_dist +inbox 1 -noedit -to somebody@example.com -fcc +outbox
 run_test 'scan +outbox -width 6 2' '   2  '
 
 test_dist +inbox 1 -noedit -to somebody@example.com -fcc +outbox
 run_test 'scan +outbox -width 6 2' '   2  '
 

+# check Distribute- and Distribution-
+start_test "Distribute- and Distribution-"
+cat >"$expected" <<EOF
+  -- Network Recipients --
+  dist-recipient at example.com
+EOF
+
+folder -f +inbox >/dev/null
+arith_eval `pick last` + 1
+new_msg=$arith_val
+cat >`mhpath new` <<EOF
+From: Test$new_msg <test$new_msg@example.com>
+Date: Sun, 10 May 2020 10:00:00
+EOF
+
+cat >`mhpath new` <<EOF
+Distribution-From: <a@example.com>
+Distribute-To: <dist-recipient@example.com>
+EOF
+
+mhdist=`pick last` mhaltmsg=`mhpath $new_msg` whom `mhpath last` >"$actual"
+check "$expected" "$actual"
+

 #
 # Check that dist encodes headers using RFC-2047 properly
 #
 #
 # Check that dist encodes headers using RFC-2047 properly
 #

-
+start_test "dist encodes headers using RFC-2047 properly"

 require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 
 cat >"$expected" <<EOF
 require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 
 cat >"$expected" <<EOF


@@ -429,4 +470,5 @@ EOF
 test_dist +inbox 1 -noedit -from 'Mr Føo Bar <resent-from@example.com>' \
          -to 'Mr Nobodÿ <resent-to@example.com>' -fcc +outbox
 
 test_dist +inbox 1 -noedit -from 'Mr Føo Bar <resent-from@example.com>' \
          -to 'Mr Nobodÿ <resent-to@example.com>' -fcc +outbox
 

+finish_test

 exit ${failed:-0}
 exit ${failed:-0}

diff --git a/uip/distsbr.c b/uip/distsbr.c
index f830bc9b3054dbb96f1d1e8c8f7a79082eafa313..16ad8685b0a5eaa5149451aa0d15f54fa423930b 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -58,12 +58,20 @@ distout (char *drft, char *msgnam, char *backup)
        switch (state = m_getfld2(&gstate, name, buffer, &buffersz)) {
            case FLD: 
            case FLDPLUS: 
        switch (state = m_getfld2(&gstate, name, buffer, &buffersz)) {
            case FLD: 
            case FLDPLUS: 

-               if (uprf (name, "distribute-"))
-                   snprintf (name, sizeof(name), "%s%.*s", "Resent",
-                             (int) sizeof name - 7, &name[10]);
-               if (uprf (name, "distribution-"))
-                   snprintf (name, sizeof(name), "%s%.*s", "Resent",
-                             (int) sizeof name - 7, &name[12]);
+               if (uprf (name, "distribute-")) {
+                   (void) memcpy(name, "Resent", 6);
+                   (void) memmove(name + 6, name + 10, sizeof name - 10);
+                   /* in case the string wasn't null terminated,
+                      4 = strlen("distribute") - strlen("Resent") */
+                   name[sizeof name - 4] = '\0';
+                }
+               if (uprf (name, "distribution-")) {
+                   (void) memcpy(name, "Resent", 6);
+                   (void) memmove(name + 6, name + 12, sizeof name - 12);
+                   /* in case the string wasn't null terminated,
+                      6 = strlen("distribution") - strlen("Resent") */
+                   name[sizeof name - 6] = '\0';
+                }

                if (!uprf (name, "resent")) {
                    inform(BADHDR, "draft", name);
                    goto leave_bad;
                if (!uprf (name, "resent")) {
                    inform(BADHDR, "draft", name);
                    goto leave_bad;