commit util-linux for openSUSE:Factory
Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2013-09-30 09:32:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "util-linux" Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/util-linux.changes 2013-09-29 17:54:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.util-linux.new/util-linux.changes 2013-09-30 09:32:50.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Sep 27 21:58:03 UTC 2013 - mgorse@suse.com + +- Add more-check-for-buffer-size-when-write-multibyte-char.patch and + more-guarantee-space-for-multibyte.patch -- check for buffer space with + multi-byte chars (BNC#829720). + +------------------------------------------------------------------- New: ---- more-check-for-buffer-size-when-write-multibyte-char.patch more-guarantee-space-for-multibyte.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.cGKfFZ/_old 2013-09-30 09:32:51.000000000 +0200 +++ /var/tmp/diff_new_pack.cGKfFZ/_new 2013-09-30 09:32:51.000000000 +0200 @@ -102,6 +102,10 @@ Patch5: eject-scsi-check-host_status-and-driver_status.patch # PATCH-FIX-UPSTREAM more-fix-buffer-overflow.patch bnc839720 mgorse@suse.com -- More: Fix under-allocation of memory. Patch6: more-fix-buffer-overflow.patch +# PATCH-FIX-UPSTREAM more-check-for-buffer-size-when-write-multibyte-char.patch bnc839720 mgorse@suse.com +Patch7: more-check-for-buffer-size-when-write-multibyte-char.patch +# PATCH-FIX-UPSTREAM more-guarantee-space-for-multibyte.patch bnc839720 mgorse@suse.com +Patch8: more-guarantee-space-for-multibyte.patch # disable encryption Patch12: util-linux-2.23.1-noenc-suse.diff @@ -222,6 +226,8 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 %patch12 -p1 # %patch20 -p1 ++++++ more-check-for-buffer-size-when-write-multibyte-char.patch ++++++
Signed-off-by: Karel Zak <kzak@redhat.com> --- text-utils/more.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/text-utils/more.c b/text-utils/more.c index 3377118..9af15b3 100644 --- a/text-utils/more.c +++ b/text-utils/more.c @@ -912,7 +912,8 @@ int get_line(register FILE *f, int *length) Fseek(f, file_pos_bak); break_flag = 1; } else { - for (i = 0; i < mbc_pos; i++) + for (i = 0; p < &Line[LineLen - 1] && + i < mbc_pos; i++) *p++ = mbc[i]; if (wc_width > 0) column += wc_width; -- 1.8.4 ++++++ more-guarantee-space-for-multibyte.patch ++++++
.. to make the code more robust. Signed-off-by: Karel Zak <kzak@redhat.com> --- text-utils/more.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/text-utils/more.c b/text-utils/more.c index 9af15b3..ac35acc 100644 --- a/text-utils/more.c +++ b/text-utils/more.c @@ -1030,6 +1030,12 @@ int get_line(register FILE *f, int *length) if (column >= Mcol && fold_opt) break; +#ifdef HAVE_WIDECHAR + if (use_mbc_buffer_flag == 0 && p >= &Line[LineLen - 1 - 4]) + /* don't read another char if there is no space for + * whole multibyte sequence */ + break; +#endif c = Getc(f); } if (column >= Mcol && Mcol > 0) { -- 1.8.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de