Attachment 18994 Details for Bug 54774

[patch] ne wpatch from author. we should probably use this.

neon-CAN-2004-0398.patch (text/plain), 3.08 KB, created by Sebastian Krahmer on 2004-05-04 20:03:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Krahmer

Created: 2004-05-04 20:03:49 UTC

Size: 3.08 KB

patch

obsolete

>Index: src/ne_dates.c
>===================================================================
>RCS file: /home/cvs/neon/src/ne_dates.c,v
>retrieving revision 1.28.2.1
>diff -u -r1.28.2.1 ne_dates.c
>--- src/ne_dates.c	2 May 2004 16:00:35 -0000	1.28.2.1
>+++ src/ne_dates.c	2 May 2004 18:21:53 -0000
>@@ -47,7 +47,7 @@
> /* RFC1123: Sun, 06 Nov 1994 08:49:37 GMT */
> #define RFC1123_FORMAT "%3s, %02d %3s %4d %02d:%02d:%02d GMT"
> /* RFC850:  Sunday, 06-Nov-94 08:49:37 GMT */
>-#define RFC1036_FORMAT "%s %2d-%3s-%2d %2d:%2d:%2d GMT"
>+#define RFC1036_FORMAT "%10s %2d-%3s-%2d %2d:%2d:%2d GMT"
> /* asctime: Wed Jun 30 21:49:08 1993 */
> #define ASCTIME_FORMAT "%3s %3s %2d %2d:%2d:%2d %4d"
> 
>@@ -133,7 +133,7 @@
> time_t ne_rfc1123_parse(const char *date) 
> {
>     struct tm gmt = {0};
>-    static char wkday[4], mon[4];
>+    char wkday[4], mon[4];
>     int n;
> /*  it goes: Sun, 06 Nov 1994 08:49:37 GMT */
>     n = sscanf(date, RFC1123_FORMAT,
>@@ -156,7 +156,7 @@
> {
>     struct tm gmt = {0};
>     int n;
>-    static char wkday[10], mon[4];
>+    char wkday[11], mon[4];
>     /* RFC850/1036 style dates: Sunday, 06-Nov-94 08:49:37 GMT */
>     n = sscanf(date, RFC1036_FORMAT,
> 		wkday, &gmt.tm_mday, mon, &gmt.tm_year,
>@@ -189,7 +189,7 @@
> {
>     struct tm gmt = {0};
>     int n;
>-    static char wkday[4], mon[4];
>+    char wkday[4], mon[4];
>     n = sscanf(date, ASCTIME_FORMAT,
> 		wkday, mon, &gmt.tm_mday, 
> 		&gmt.tm_hour, &gmt.tm_min, &gmt.tm_sec,
>Index: test/util-tests.c
>===================================================================
>RCS file: /home/cvs/neon/test/util-tests.c,v
>retrieving revision 1.42
>diff -u -r1.42 util-tests.c
>--- test/util-tests.c	22 Apr 2003 13:18:34 -0000	1.42
>+++ test/util-tests.c	2 May 2004 18:26:15 -0000
>@@ -1,6 +1,6 @@
> /* 
>    utils tests
>-   Copyright (C) 2001-2003, Joe Orton <joe@manyfish.co.uk>
>+   Copyright (C) 2001-2004, Joe Orton <joe@manyfish.co.uk>
> 
>    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
>@@ -165,6 +165,7 @@
> } good_dates[] = {
>     { "Fri, 08 Jun 2001 22:59:46 GMT", 992041186, d_rfc1123 },
>     { "Friday, 08-Jun-01 22:59:46 GMT", 992041186, d_rfc1036 },
>+    { "Wednesday, 06-Jun-01 22:59:46 GMT", 991868386, d_rfc1036 },
>     /* some different types of ISO8601 dates. */
>     { "2001-06-08T22:59:46Z", 992041186, d_iso8601 },
>     { "2001-06-08T22:59:46.9Z", 992041186, d_iso8601 },
>@@ -199,6 +200,23 @@
>     return OK;
> }
> 
>+/* trigger segfaults in ne_rfc1036_parse() in <=0.24.5. */
>+static int regress_dates(void)
>+{
>+    static const char *dates[] = {
>+        "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
>+    };
>+    size_t n;
>+    
>+    for (n = 0; n < sizeof(dates)/sizeof(dates[0]); n++) {
>+        ne_rfc1036_parse(dates[n]);
>+        ne_iso8601_parse(dates[n]);
>+        ne_rfc1123_parse(dates[n]);
>+    }
>+
>+    return OK;
>+}
>+
> static int versioning(void)
> {
> #define GOOD(n,m,msg) ONV(ne_version_match(n,m), \
>@@ -249,6 +267,7 @@
>     T(md5),
>     T(md5_alignment),
>     T(parse_dates),
>+    T(regress_dates),
>     T(versioning),
>     T(version_string),
>     T(support),

Actions: View | Diff

Attachments on bug 54774: 18914 | 18915 | 18994 | 19282 | 19283