9e4b0bf82d
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/rsync#47694dc9540f95cb1551999121cac4aab283e718
23 lines
652 B
Diff
23 lines
652 B
Diff
diff --git a/log.c b/log.c
|
|
index 34a013b..1aca728 100644
|
|
--- a/log.c
|
|
+++ b/log.c
|
|
@@ -377,10 +377,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
|