Attachment 698276 Details for Bug 911929 – fix-coreutils-i18n.patch-to-terminate-mbdelim-string.patch

[patch] fix-coreutils-i18n.patch-to-terminate-mbdelim-string.patch

0001-fix-coreutils-i18n.patch-to-terminate-mbdelim-string.patch (text/plain), 2.00 KB, created by Mark Wielaard on 2013-02-16 20:19:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Wielaard

Created: 2013-02-16 20:19:06 UTC

Size: 2.00 KB

patch

obsolete

>From 19f90d1627c390b4545301e655d6f2d726c4fdc7 Mon Sep 17 00:00:00 2001
>From: Mark Wielaard <mjw@redhat.com>
>Date: Sat, 16 Feb 2013 21:13:13 +0100
>Subject: [PATCH] fix coreutils-i18n.patch to terminate mbdelim string
> (#911929)
>
>
>Signed-off-by: Mark Wielaard <mjw@redhat.com>
>---
> coreutils-i18n.patch | 3 ++-
> coreutils.spec       | 5 ++++-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch
>index 5bc56d1..5932f29 100644
>--- a/coreutils-i18n.patch
>+++ b/coreutils-i18n.patch
>@@ -498,7 +498,7 @@ diff -urNp coreutils-8.21-orig/src/cut.c coreutils-8.21/src/cut.c
>          case 'f':
>            /* Build the field list. */
>            if (operating_mode != undefined_mode)
>-@@ -808,10 +1150,35 @@ main (int argc, char **argv)
>+@@ -808,10 +1150,36 @@ main (int argc, char **argv)
>          case 'd':
>            /* New delimiter. */
>            /* Interpret -d '' to mean 'use the NUL byte as the delimiter.'  */
>@@ -523,6 +523,7 @@ diff -urNp coreutils-8.21-orig/src/cut.c coreutils-8.21/src/cut.c
> +                      if (wcdelim != L'\0' && *(optarg + delimlen) != '\0')
> +                        FATAL_ERROR (_("the delimiter must be a single character"));
> +                      memcpy (mbdelim, optarg, delimlen);
>++                      mbdelim[delimlen] = '\0';
> +                    }
> +                }
> +
>diff --git a/coreutils.spec b/coreutils.spec
>index 90c31e5..381f689 100644
>--- a/coreutils.spec
>+++ b/coreutils.spec
>@@ -1,7 +1,7 @@
> Summary: A set of basic GNU tools commonly used in shell scripts
> Name:    coreutils
> Version: 8.21
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> License: GPLv3+
> Group:   System Environment/Base
> Url:     http://www.gnu.org/software/coreutils/
>@@ -378,6 +378,9 @@ fi
> %{_sbindir}/chroot
> 
> %changelog
>+* Sat Feb 16 2013 Mark Wielaard <mjw@redhat.com> 8.21-2
>+- fix coreutils-i18n.patch to terminate mbdelim string (#911929)
>+
> * Fri Feb 15 2013 Ondrej Vasik <ovasik@redhat.com> 8.21-1
> - new upstream release 8.21, update patches
> 
>-- 
>1.8.1.2
>

Actions: View | Diff

Attachments on bug 911929: 698276