Attachment 19603 Details for Bug 54773

[patch] New fix from Derek, which calims to also fix interoperability issues with winCVS introduced by last fix

ccvs-exploit-20040519.2.diff (text/plain), 3.33 KB, created by Sebastian Krahmer on 2004-05-14 16:49:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sebastian Krahmer

Created: 2004-05-14 16:49:46 UTC

Size: 3.33 KB

patch

obsolete

>Index: src/server.c
>===================================================================
>RCS file: /cvs/ccvs/src/server.c,v
>retrieving revision 1.358
>diff -u -p -r1.358 server.c
>--- src/server.c	8 May 2004 23:19:05 -0000	1.358
>+++ src/server.c	11 May 2004 19:22:41 -0000
>@@ -1610,8 +1610,18 @@ serve_unchanged (char *arg)
> 	    && strncmp (arg, name, cp - name) == 0)
> 	{
> 	    timefield = strchr (cp + 1, '/') + 1;
>-	    if (*timefield != '=')
>+	    /* If the time field is not currently empty, then one of
>+	     * serve_modified, serve_is_modified, & serve_unchanged were
>+	     * already called for this file.  We would like to ignore the
>+	     * reinvocation silently or, better yet, exit with an error
>+	     * message, but we just avoid the copy-forward and overwrite the
>+	     * value from the last invocation instead.  See the comment below
>+	     * for more.
>+	     */
>+	    if (*timefield == '/')
> 	    {
>+		/* Copy forward one character.  Space was allocated for this
>+		 * already in serve_entry().  */
> 		cp = timefield + strlen (timefield);
> 		cp[1] = '\0';
> 		while (cp > timefield)
>@@ -1619,8 +1629,17 @@ serve_unchanged (char *arg)
> 		    *cp = cp[-1];
> 		    --cp;
> 		}
>-		*timefield = '=';
> 	    }
>+	    /* If *TIMEFIELD wasn't "/", we assume that it was because of
>+	     * multiple calls to Is-Modified & Unchanged by the client and
>+	     * just overwrite the value from the last call.  Technically, we
>+	     * should probably either ignore calls after the first or send the
>+	     * client an error, since the client/server protocol specification
>+	     * specifies that only one call to either Is-Modified or Unchanged
>+	     * is allowed, but broken versions of WinCVS & TortoiseCVS rely on
>+	     * this behavior.
>+	     */
>+	    *timefield = '=';
> 	    break;
> 	}
>     }
>@@ -1655,8 +1674,18 @@ serve_is_modified (char *arg)
> 	    && strncmp (arg, name, cp - name) == 0)
> 	{
> 	    timefield = strchr (cp + 1, '/') + 1;
>-	    if (!(timefield[0] == 'M' && timefield[1] == '/'))
>+	    /* If the time field is not currently empty, then one of
>+	     * serve_modified, serve_is_modified, & serve_unchanged were
>+	     * already called for this file.  We would like to ignore the
>+	     * reinvocation silently or, better yet, exit with an error
>+	     * message, but we just avoid the copy-forward and overwrite the
>+	     * value from the last invocation instead.  See the comment below
>+	     * for more.
>+	     */
>+	    if (*timefield == '/')
> 	    {
>+		/* Copy forward one character.  Space was allocated for this
>+		 * already in serve_entry().  */
> 		cp = timefield + strlen (timefield);
> 		cp[1] = '\0';
> 		while (cp > timefield)
>@@ -1664,8 +1693,17 @@ serve_is_modified (char *arg)
> 		    *cp = cp[-1];
> 		    --cp;
> 		}
>-		*timefield = 'M';
> 	    }
>+	    /* If *TIMEFIELD wasn't "/", we assume that it was because of
>+	     * multiple calls to Is-Modified & Unchanged by the client and
>+	     * just overwrite the value from the last call.  Technically, we
>+	     * should probably either ignore calls after the first or send the
>+	     * client an error, since the client/server protocol specification
>+	     * specifies that only one call to either Is-Modified or Unchanged
>+	     * is allowed, but broken versions of WinCVS & TortoiseCVS rely on
>+	     * this behavior.
>+	     */
>+	    *timefield = 'M';
> 	    if (kopt != NULL)
> 	    {
> 		if (alloc_pending (strlen (name) + 80))

Actions: View | Diff

Attachments on bug 54773: 18913 | 18919 | 18920 | 19603 | 20020 | 20405 | 20524 | 20697