Attachment 20997 Details for Bug 18997 – patch 6/8

[patch] patch 6/8

0006-use-memcmp-instead-of-binaryEqual.patch (text/plain), 1.30 KB, created by Peter Breitenlohner on 2008-12-10 01:38:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Breitenlohner

Created: 2008-12-10 01:38:49 UTC

Size: 1.30 KB

patch

obsolete

>From 7dc5ebe06651cdf1f08e01a333deb1d330a6c63d Mon Sep 17 00:00:00 2001
>From: Peter Breitenlohner <peb@mppmu.mpg.de>
>Date: Mon, 8 Dec 2008 18:41:34 +0100
>Subject: [PATCH] use memcmp instead of binaryEqual
>
>suggested by Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>http://lists.freedesktop.org/archives/xorg/2008-December/041222.html
>---
> src/iceauth.c |   19 +------------------
> 1 files changed, 1 insertions(+), 18 deletions(-)
>
>diff --git a/src/iceauth.c b/src/iceauth.c
>index 6addcf8..40f1fff 100644
>--- a/src/iceauth.c
>+++ b/src/iceauth.c
>@@ -38,8 +38,6 @@ Author: Ralph Mor, X Consortium
> #include <time.h>
> #define Time_t time_t
> 
>-static int binaryEqual (const char *a, const char *b, unsigned len);
>-
> static int was_called_state;
> 
> /*
>@@ -213,7 +211,7 @@ _IcePaMagicCookie1Proc (
> 	    IcePaAuthStatus stat;
> 
> 	    if (authDataLen == length &&
>-	        binaryEqual ((char *) authData, data, authDataLen))
>+	        memcmp (authData, data, authDataLen) == 0)
> 	    {
> 		stat = IcePaAuthAccepted;
> 	    }
>@@ -249,18 +247,3 @@ _IcePaMagicCookie1Proc (
> }
> 
> IcePaAuthProc	_IcePaAuthProcs[] = {_IcePaMagicCookie1Proc};
>-
>-
>-/*
>- * local routines
>- */
>-
>-static int
>-binaryEqual (const char *a, const char *b, unsigned len)
>-
>-{
>-    while (len--)
>-	if (*a++ != *b++)
>-	    return 0;
>-    return 1;
>-}
>-- 
>1.6.0.3
>

Actions: View | Splinter Review

Attachments on bug 18997: 20992 | 20993 | 20994 | 20995 | 20996 | 20997 | 20998 | 20999 | 21230

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.