[SCM] Samba Shared Repository - branch master updated
Rusty Russell
rusty at samba.org
Wed Jul 6 00:35:02 MDT 2011
The branch, master has been updated
via c019302 ccan/tally: don't use SIZE_MAX.
from 44a016c build: we no longer put #if _SAMBA_BUILD_ == 4 in public headers
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c019302e65051f214c5ea2ef908aa0ef79c8b12e
Author: Rusty Russell <rusty at rustcorp.com.au>
Date: Wed Jul 6 14:47:44 2011 +0930
ccan/tally: don't use SIZE_MAX.
Michael Adam points out this broke the build farm (ie. OSF1 axp V5.1 2650 alpha)
so fixed in CCAN and imported from af7a902d74a7926693f55da9e21a67dde46931d4:
Turns out it's not standard (thanks Samba build farm!)
And the previous test had a hole in it anyway. This one is more conservative.
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
Autobuild-User: Rusty Russell <rusty at rustcorp.com.au>
Autobuild-Date: Wed Jul 6 08:34:05 CEST 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/ccan/tally/tally.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ccan/tally/tally.c b/lib/ccan/tally/tally.c
index b1839be..396474b 100644
--- a/lib/ccan/tally/tally.c
+++ b/lib/ccan/tally/tally.c
@@ -27,8 +27,8 @@ struct tally *tally_new(unsigned buckets)
if (buckets == 0)
buckets = 1;
- /* Check for overflow. */
- if (buckets && SIZE_MAX / buckets < sizeof(tally->counts[0]))
+ /* Overly cautious check for overflow. */
+ if (sizeof(*tally) * buckets / sizeof(*tally) != buckets)
return NULL;
tally = malloc(sizeof(*tally) + sizeof(tally->counts[0])*(buckets-1));
if (tally) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list