Attachment 14823 Details for Bug 14813 – 0002-Remove-some-always-true-comparisons-due-to-structure.patch

[patch] 0002-Remove-some-always-true-comparisons-due-to-structure.patch

0002-Remove-some-always-true-comparisons-due-to-structure.patch (text/plain), 1.81 KB, created by Paulo César Pereira de Andrade on 2008-03-04 13:20:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-03-04 13:20:17 UTC

Size: 1.81 KB

patch

obsolete

>From d9428f7819b7979086109595c8ef1d63f8675d9c Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Tue, 4 Mar 2008 17:47:00 -0300
>Subject: [PATCH] Remove some always true comparisons due to structure field type/size.
>
>  I.e. it was trying to compare an unsigned char to make sure it is
>smaller than SIZE_MAX/sizeof(char*) or smaller than a structure
>holding a pointer and a 32 bits integer.
>  This would never be true even on a 16 bits architecture.
>---
> src/FSGetCats.c  |    1 -
> src/FSListExt.c  |    1 -
> src/FSOpenServ.c |    9 ---------
> 3 files changed, 0 insertions(+), 11 deletions(-)
>
>diff --git a/src/FSGetCats.c b/src/FSGetCats.c
>index 36a134b..bcd4a7c 100644
>--- a/src/FSGetCats.c
>+++ b/src/FSGetCats.c
>@@ -77,7 +77,6 @@ FSGetCatalogues(
>     }
>     if (rep.num_catalogues
> #if (SIZE_MAX >> 2) <= UINT_MAX
>-	&& rep.num_catalogues <= SIZE_MAX/sizeof(char *)
> 	&& rep.length <= (SIZE_MAX >> 2)
> #endif
> 	) {
>diff --git a/src/FSListExt.c b/src/FSListExt.c
>index 4eab13d..eb62b6a 100644
>--- a/src/FSListExt.c
>+++ b/src/FSListExt.c
>@@ -78,7 +78,6 @@ FSListExtensions(
>     }
>     if (rep.nExtensions
> #if (SIZE_MAX >> 2) <= UINT_MAX
>-	&& rep.nExtensions <= SIZE_MAX / sizeof(char *)
> 	&& rep.length <= (SIZE_MAX>>2)
> #endif
> 	) {
>diff --git a/src/FSOpenServ.c b/src/FSOpenServ.c
>index d547fa4..0243426 100644
>--- a/src/FSOpenServ.c
>+++ b/src/FSOpenServ.c
>@@ -164,15 +164,6 @@ FSOpenServer(char *server)
>     _FSRead(svr, (char *) alt_data, setuplength);
>     ad = alt_data;
> 
>-#if SIZE_MAX <= UINT_MAX
>-    if (prefix.num_alternates > SIZE_MAX / sizeof(AlternateServer)) {
>-	errno = ENOMEM;
>-	FSfree((char *) alt_data);
>-	FSfree((char *) svr);
>-	return (FSServer *) 0;
>-    }
>-#endif
>-
>     alts = (AlternateServer *)
> 	FSmalloc(sizeof(AlternateServer) * prefix.num_alternates);
>     if (!alts) {
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 14813: 14822 | 14823

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.