[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  c0c6a97c Try to fix the iconv crash in bug 11338.
      from  d47d3792 Fix bug in try_dests_reg that Florian Zumbiehl pointed out.

https://git.samba.org/?p=rsync.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c0c6a97c35e8e4fb56ba26dc9c8447e26d94de06
Author: Wayne Davison <wayned at samba.org>
Date:   Sat Mar 16 11:49:53 2019 -0700

    Try to fix the iconv crash in bug 11338.
    
    Applying Michal Ruprich's suggested patch for the rwrite() function that
    should hopefully help with a bug that I couldn't reproduce.

-----------------------------------------------------------------------

Summary of changes:
 log.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/log.c b/log.c
index 21bcdfd9..a86edd74 100644
--- a/log.c
+++ b/log.c
@@ -378,10 +378,13 @@ output_msg:
 				filtered_fwrite(f, convbuf, outbuf.len, 0);
 				outbuf.len = 0;
 			}
-			if (!ierrno || ierrno == E2BIG)
-				continue;
-			fprintf(f, "\\#%03o", CVAL(inbuf.buf, inbuf.pos++));
-			inbuf.len--;
+			/* Log one byte of illegal/incomplete sequence and continue with
+			 * the next character. Check that the buffer is non-empty for the
+			 * sake of robustness. */
+			if ((ierrno == EILSEQ || ierrno == EINVAL) && inbuf.len) {
+				fprintf(f, "\\#%03o", CVAL(inbuf.buf, inbuf.pos++));
+				inbuf.len--;
+			}
 		}
 	} else
 #endif


-- 
The rsync repository.