DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :cc:content-type:content-transfer-encoding;
        b=O7XIuJBwHYAIUPqJRbvxbb+GttqddE/1xOzAuBRJb6/9zp7haI14g+p3sszFlCn8+K
         cr7bn514cPZ7F3Li0m3s7/sNj0MtktqlbHrV3gTJxdqsgeReGKOU5HCPM6qyy4hyjQR2
         iEM1XURTINPUpm9buoR3BcIk7ZJpWXs8rHtn0=
MIME-Version: 1.0
In-Reply-To: <30e5fd087ee6fbe992cde8f09d945ed160b0c117.1263675077.git.andre.goddard@gmail.com>
References: <cover.1263675077.git.andre.goddard@gmail.com>
	 <30e5fd087ee6fbe992cde8f09d945ed160b0c117.1263675077.git.andre.goddard@gmail.com>
Date: Mon, 18 Jan 2010 00:47:04 +0100
Message-ID: <81b0412b1001171547s57190f69p489278d1fdf78251@mail.gmail.com>
Subject: Re: [PATCH 2/2] string: teach strnstr() to not search past 
	NUL-terminator
From: Alex Riesen <raa.lkml@gmail.com>
To: =?UTF-8?Q?Andr=C3=A9_Goddard_Rosa?= <andre.goddard@gmail.com>
Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org,
       Li Zefan <lizf@cn.fujitsu.com>,
       Andrew Morton <akpm@linux-foundation.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 863
Lines: 28

On Sat, Jan 16, 2010 at 21:57, André Goddard Rosa
<andre.goddard@gmail.com> wrote:
> diff --git a/lib/string.c b/lib/string.c
> index 0f86245..94bad34 100644
> --- a/lib/string.c
> +++ b/lib/string.c
> @@ -689,11 +689,13 @@ EXPORT_SYMBOL(strstr);
>  */
>  char *strnstr(const char *s1, const char *s2, size_t len)
>  {
> -       size_t l1 = len, l2;
> +       size_t l1, l2;
>
>        l2 = strlen(s2);
>        if (!l2)
>                return (char *)s1;
> +       l1 = strlen(s1);
> +       l1 = (l1 <= len) ? l1 : len;

if (l1 > len)
       l1 = len;

Less code and easier to read.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/