Attachment 867498 Details for Bug 1069657 – upstream proposed fix

[patch] upstream proposed fix

coreutils-8.22-date-tz-crash.patch (text/plain), 2.82 KB, created by Pádraig Brady on 2014-02-25 16:07:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pádraig Brady

Created: 2014-02-25 16:07:53 UTC

Size: 2.82 KB

patch

obsolete

>From http://bugs.gnu.org/16872
>
>diff -Naur coreutils-8.22.orig/gnulib-tests/test-parse-datetime.c coreutils-8.22/gnulib-tests/test-parse-datetime.c
>--- coreutils-8.22.orig/gnulib-tests/test-parse-datetime.c	2013-12-04 14:53:33.000000000 +0000
>+++ coreutils-8.22/gnulib-tests/test-parse-datetime.c	2014-02-25 10:57:33.606029811 +0000
>@@ -1,5 +1,5 @@
> /* Test of parse_datetime() function.
>-   Copyright (C) 2008-2013 Free Software Foundation, Inc.
>+   Copyright (C) 2008-2014 Free Software Foundation, Inc.
> 
>    This program is free software; you can redistribute it and/or modify
>    it under the terms of the GNU General Public License as published by
>@@ -419,5 +419,21 @@
>      starting with a high-bit-set byte would be treated like "0".  */
>   ASSERT ( ! parse_datetime (&result, "\xb0", &now));
> 
>+  /* Exercise TZ="" parsing code.  */
>+  /* These two would infloop or segfault before Feb 2014.  */
>+  ASSERT ( ! parse_datetime (&result, "TZ=\"\"\"", &now));
>+  ASSERT ( ! parse_datetime (&result, "TZ=\"\" \"", &now));
>+  /* Exercise invalid patterns.  */
>+  ASSERT ( ! parse_datetime (&result, "TZ=\"", &now));
>+  ASSERT ( ! parse_datetime (&result, "TZ=\"\\\"", &now));
>+  ASSERT ( ! parse_datetime (&result, "TZ=\"\\n", &now));
>+  ASSERT ( ! parse_datetime (&result, "TZ=\"\\n\"", &now));
>+  /* Exercise valid patterns.  */
>+  ASSERT (   parse_datetime (&result, "TZ=\"\"", &now));
>+  ASSERT (   parse_datetime (&result, "TZ=\"\" ", &now));
>+  ASSERT (   parse_datetime (&result, " TZ=\"\"", &now));
>+  ASSERT (   parse_datetime (&result, "TZ=\"\\\\\"", &now));
>+  ASSERT (   parse_datetime (&result, "TZ=\"\\\"\"", &now));
>+
>   return 0;
> }
>diff -Naur coreutils-8.22.orig/lib/parse-datetime.y coreutils-8.22/lib/parse-datetime.y
>--- coreutils-8.22.orig/lib/parse-datetime.y	2013-12-04 14:53:33.000000000 +0000
>+++ coreutils-8.22/lib/parse-datetime.y	2014-02-25 10:52:07.237994790 +0000
>@@ -1,7 +1,7 @@
> %{
> /* Parse a string into an internal time stamp.
> 
>-   Copyright (C) 1999-2000, 2002-2013 Free Software Foundation, Inc.
>+   Copyright (C) 1999-2000, 2002-2014 Free Software Foundation, Inc.
> 
>    This program is free software: you can redistribute it and/or modify
>    it under the terms of the GNU General Public License as published by
>@@ -1303,8 +1303,6 @@
>             char tz1buf[TZBUFSIZE];
>             bool large_tz = TZBUFSIZE < tzsize;
>             bool setenv_ok;
>-            /* Free tz0, in case this is the 2nd or subsequent time through. */
>-            free (tz0);
>             tz0 = get_tz (tz0buf);
>             z = tz1 = large_tz ? xmalloc (tzsize) : tz1buf;
>             for (s = tzbase; *s != '"'; s++)
>@@ -1316,7 +1314,12 @@
>             if (!setenv_ok)
>               goto fail;
>             tz_was_altered = true;
>+
>             p = s + 1;
>+            while (c = *p, c_isspace (c))
>+              p++;
>+
>+            break;
>           }
>     }
>

Actions: View | Diff

Attachments on bug 1069657: 867409 | 867410 | 867411 | 867412 | 867413 | 867414 | 867415 | 867416 | 867417 | 867418 | 867498